Add Profile::OTRProfileID::CreateFromProfileID() via chromium override

The constructor Profile::OTRProfileID::OTRProfileID is private now, so we need a way of creating an instance from Brave's TorProfileManager that doesn't require access to Profile::OTRProfileID's private members. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/990446325f38f9c1cdc22d6b1703aa0554089424 commit 990446325f38f9c1cdc22d6b1703aa0554089424 Author: Ramin Halavati <[email protected]> Date: Mon Apr 19 12:10:37 2021 +0000 Make OTRProfileID constructor private. OTRProfileID constructor is made private to reduce the possibility of using duplicate ids and making MakeUnique function more visible. OTRProfileID::CreateUniqueForTesting() is added to be used as a shorthand in tests since we don't need specific id prefixes in tests. This CL does not change any behavior. Bug: 1196661
brave · Apr 20, 2021 · 13fe236 · 13fe236
1 parent 6c13519
commit 13fe236
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/browser/tor/tor_profile_manager.cc b/browser/tor/tor_profile_manager.cc
@@ -75,7 +75,8 @@ TorProfileManager::~TorProfileManager() {
 
 Profile* TorProfileManager::GetTorProfile(Profile* original_profile) {
   Profile* tor_profile = original_profile->GetOffTheRecordProfile(
-      Profile::OTRProfileID(tor::kTorProfileID), /*create_if_needed=*/true);
+      Profile::OTRProfileID::CreateFromProfileID(tor::kTorProfileID),
+      /*create_if_needed=*/true);
 
   const std::string context_id = tor_profile->UniqueId();
   auto it = tor_profiles_.find(context_id);

diff --git a/chromium_src/chrome/browser/profiles/profile.cc b/chromium_src/chrome/browser/profiles/profile.cc
@@ -18,6 +18,12 @@ const Profile::OTRProfileID Profile::OTRProfileID::TorID() {
   return OTRProfileID(tor::kTorProfileID);
 }
 
+// static
+Profile::OTRProfileID Profile::OTRProfileID::CreateFromProfileID(
+    const std::string& profile_id) {
+  return OTRProfileID(profile_id);
+}
+
 bool Profile::IsTor() const {
   return IsOffTheRecord() && GetOTRProfileID() == OTRProfileID::TorID();
 }

diff --git a/chromium_src/chrome/browser/profiles/profile.h b/chromium_src/chrome/browser/profiles/profile.h
@@ -7,13 +7,17 @@
 #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PROFILES_PROFILE_H_
 
 #define PrimaryID PrimaryID(); static const OTRProfileID TorID
+#define CreateUniqueForTesting                        \
+  CreateFromProfileID(const std::string& profile_id); \
+  static OTRProfileID CreateUniqueForTesting
 #define HasPrimaryOTRProfile IsTor() const override; bool HasPrimaryOTRProfile
 #define IsIncognitoProfile                 \
   IsIncognitoProfile_ChromiumImpl() const; \
   bool IsIncognitoProfile
 #include "../../../../../chrome/browser/profiles/profile.h"
 #undef IsIncognitoProfile
-#undef PrimaryID
 #undef HasPrimaryOTRProfile
+#undef CreateUniqueForTesting
+#undef PrimaryID
 
 #endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PROFILES_PROFILE_H_