Revert "Simple code cleanup."

This reverts commit 0aa36d96.

Reason for revert: landed prior to receiving LGTM, CL is NOT LGTM to gab@
https://chromium-review.googlesource.com/c/chromium/src/+/892582#message-1f3ca486683a18c2df48642825a99cee199034bc

Original change's description:
> Simple code cleanup.
> 
> Passed PrefRegistry and PrefRegistrySyncable by raw pointer instead of reference
> to scoped_ptr. PrefRegistry and PrefRegistrySyncable have an internal reference
> count. There is no need to use a double indirection when passing them around.
> 
> Used base::MakeRefCounted instead of naked 'new' operator.
> 
> Change-Id: I53a0fdfc99b7ef3dd32b191664520659c2585fa5
> Reviewed-on: https://chromium-review.googlesource.com/892582
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: François Degros <fdegros@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#533087}

TBR=sky@chromium.org,gab@chromium.org,erg@chromium.org,fdegros@chromium.org

Change-Id: I082b80ef79afd99f093ac8327381ee1293351cfd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/895362Reviewed-by: Gabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533227}

chrome/browser/browser_process_impl.cc

@@ -1034,7 +1034,7 @@ void BrowserProcessImpl::CreateLocalState() {
 
   base::FilePath local_state_path;
   CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
-  const auto pref_registry = base::MakeRefCounted<PrefRegistrySimple>();
+  auto pref_registry = base::MakeRefCounted<PrefRegistrySimple>();
 
   // Register local state preferences.
   RegisterLocalState(pref_registry.get());
@@ -1043,7 +1043,7 @@ void BrowserProcessImpl::CreateLocalState() {
   delegate->InitPrefRegistry(pref_registry.get());
   local_state_ = chrome_prefs::CreateLocalState(
       local_state_path, local_state_task_runner_.get(), policy_service(),
-      pref_registry.get(), false, std::move(delegate));
+      pref_registry, false, std::move(delegate));
   DCHECK(local_state_);
 
   pref_change_registrar_.Init(local_state_.get());

chrome/browser/chrome_browser_main.cc

@@ -390,12 +390,11 @@ PrefService* InitializeLocalState(
     if (!local_state_file_exists) {
       base::FilePath parent_profile =
           parsed_command_line.GetSwitchValuePath(switches::kParentProfile);
-      const auto registry = base::MakeRefCounted<PrefRegistrySimple>();
+      scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple();
       std::unique_ptr<PrefService> parent_local_state(
-          chrome_prefs::CreateLocalState(parent_profile,
-                                         local_state_task_runner,
-                                         g_browser_process->policy_service(),
-                                         registry.get(), false, nullptr));
+          chrome_prefs::CreateLocalState(
+              parent_profile, local_state_task_runner,
+              g_browser_process->policy_service(), registry, false, nullptr));
       registry->RegisterStringPref(prefs::kApplicationLocale, std::string());
       // Right now, we only inherit the locale setting from the parent profile.
       local_state->SetString(

chrome/browser/prefs/chrome_pref_service_factory.cc

@@ -440,7 +440,7 @@ std::unique_ptr<PrefService> CreateLocalState(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
-    PrefRegistry* pref_registry,
+    const scoped_refptr<PrefRegistry>& pref_registry,
     bool async,
     std::unique_ptr<PrefValueStore::Delegate> delegate) {
   sync_preferences::PrefServiceSyncableFactory factory;
@@ -450,7 +450,7 @@ std::unique_ptr<PrefService> CreateLocalState(
                                    std::unique_ptr<PrefFilter>()),
                  NULL,  // extension_prefs
                  async);
-  return factory.Create(pref_registry, std::move(delegate));
+  return factory.Create(pref_registry.get(), std::move(delegate));
 }
 
 std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs(
@@ -459,7 +459,7 @@ std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs(
     policy::PolicyService* policy_service,
     SupervisedUserSettingsService* supervised_user_settings,
     const scoped_refptr<PrefStore>& extension_prefs,
-    user_prefs::PrefRegistrySyncable* pref_registry,
+    const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
     bool async,
     scoped_refptr<base::SequencedTaskRunner> io_task_runner,
     std::unique_ptr<PrefValueStore::Delegate> delegate) {
@@ -471,16 +471,19 @@ std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs(
       base::MakeUnique<ResetOnLoadObserverImpl>(profile_path),
       mojo::MakeRequest(&reset_on_load_observer));
   sync_preferences::PrefServiceSyncableFactory factory;
-  const scoped_refptr<PersistentPrefStore> user_pref_store =
+  scoped_refptr<PersistentPrefStore> user_pref_store(
       CreateProfilePrefStoreManager(profile_path)
           ->CreateProfilePrefStore(
               GetTrackingConfiguration(), kTrackedPrefsReportingIDsCount,
               std::move(io_task_runner), std::move(reset_on_load_observer),
-              std::move(validation_delegate));
+              std::move(validation_delegate)));
   PrepareFactory(&factory, profile_path, policy_service,
                  supervised_user_settings, user_pref_store, extension_prefs,
                  async);
-  return factory.CreateSyncable(pref_registry, std::move(delegate));
+  std::unique_ptr<sync_preferences::PrefServiceSyncable> pref_service =
+      factory.CreateSyncable(pref_registry.get(), std::move(delegate));
+
+  return pref_service;
 }
 
 void DisableDomainCheckForTesting() {

chrome/browser/prefs/chrome_pref_service_factory.h

@@ -68,7 +68,7 @@ std::unique_ptr<PrefService> CreateLocalState(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
-    PrefRegistry* pref_registry,
+    const scoped_refptr<PrefRegistry>& pref_registry,
     bool async,
     std::unique_ptr<PrefValueStore::Delegate> delegate);
 
@@ -78,7 +78,7 @@ std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs(
     policy::PolicyService* policy_service,
     SupervisedUserSettingsService* supervised_user_settings,
     const scoped_refptr<PrefStore>& extension_prefs,
-    user_prefs::PrefRegistrySyncable* pref_registry,
+    const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
     bool async,
     scoped_refptr<base::SequencedTaskRunner> io_task_runner,
     std::unique_ptr<PrefValueStore::Delegate> delegate);

chrome/browser/profiles/profile_impl.cc

@@ -394,7 +394,7 @@ ProfileImpl::ProfileImpl(
     scoped_refptr<base::SequencedTaskRunner> io_task_runner)
     : path_(path),
       io_task_runner_(std::move(io_task_runner)),
-      pref_registry_(base::MakeRefCounted<user_prefs::PrefRegistrySyncable>()),
+      pref_registry_(new user_prefs::PrefRegistrySyncable),
       io_data_(this),
       last_session_exit_type_(EXIT_NORMAL),
       start_time_(base::Time::Now()),
@@ -503,8 +503,8 @@ ProfileImpl::ProfileImpl(
     prefs_ = chrome_prefs::CreateProfilePrefs(
         path_, std::move(pref_validation_delegate),
         profile_policy_connector_->policy_service(), supervised_user_settings,
-        CreateExtensionPrefStore(this, false), pref_registry_.get(),
-        async_prefs, GetIOTaskRunner(), std::move(delegate));
+        CreateExtensionPrefStore(this, false), pref_registry_, async_prefs,
+        GetIOTaskRunner(), std::move(delegate));
     // Register on BrowserContext.
     user_prefs::UserPrefs::Set(this, prefs_.get());
   }

chrome/browser/profiles/profile_impl.h

@@ -228,7 +228,7 @@ class ProfileImpl : public Profile {
   // Keep |prefs_| on top for destruction order because |extension_prefs_|,
   // |io_data_| and others store pointers to |prefs_| and shall be destructed
   // first.
-  const scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
+  scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
   std::unique_ptr<sync_preferences::PrefServiceSyncable> prefs_;
   // See comment in GetOffTheRecordPrefs. Field exists so something owns the
   // dummy.