Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Linux fixes, Part 3 of N

BUG=110610
TBR=darin

Review URL: https://chromiumcodereview.appspot.com/16296002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203626 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 14 insertions, 15 deletions

diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 51b3790..152c26f 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -83,7 +83,7 @@ void PrepareBuilder(
 #endif  // ENABLE_CONFIGURATION_POLICY
 
   builder->WithAsync(async);
-  builder->WithExtensionPrefs(extension_prefs);
+  builder->WithExtensionPrefs(extension_prefs.get());
   builder->WithCommandLinePrefs(
       new CommandLinePrefStore(CommandLine::ForCurrentProcess()));
   builder->WithReadErrorCallback(base::Bind(&HandleReadError));
@@ -108,7 +108,7 @@ PrefService* CreateLocalState(
                  policy_service,
                  extension_prefs,
                  async);
-  return builder.Create(pref_registry);
+  return builder.Create(pref_registry.get());
 }
 
 PrefServiceSyncable* CreateProfilePrefs(
@@ -125,7 +125,7 @@ PrefServiceSyncable* CreateProfilePrefs(
                  policy_service,
                  extension_prefs,
                  async);
-  return builder.CreateSyncable(pref_registry);
+  return builder.CreateSyncable(pref_registry.get());
 }
 
 }  // namespace chrome_prefs
diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc
index f6a24a8..a3cb07d 100644
--- a/chrome/browser/prefs/chrome_pref_service_unittest.cc
+++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc
@@ -103,7 +103,7 @@ TEST_F(ChromePrefServiceUserFilePrefsTest, PreserveEmptyValue) {
   builder.WithUserFilePrefs(pref_file, message_loop_.message_loop_proxy());
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable);
-  scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry));
+  scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry.get()));
 
   // Register testing prefs.
   registry->RegisterListPref("list",
diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc
index 2ab7ff5..82c18ba 100644
--- a/chrome/browser/prefs/pref_service_syncable.cc
+++ b/chrome/browser/prefs/pref_service_syncable.cc
@@ -91,16 +91,15 @@ PrefServiceSyncable* PrefServiceSyncable::CreateIncognitoPrefService(
           pref_registry_.get())->ForkForIncognito();
   PrefServiceSyncable* incognito_service = new PrefServiceSyncable(
       pref_notifier,
-      pref_value_store_->CloneAndSpecialize(
-          NULL,  // managed
-          incognito_extension_prefs,
-          NULL,  // command_line_prefs
-          incognito_pref_store,
-          NULL,  // recommended
-          forked_registry->defaults(),
-          pref_notifier),
+      pref_value_store_->CloneAndSpecialize(NULL,  // managed
+                                            incognito_extension_prefs,
+                                            NULL,  // command_line_prefs
+                                            incognito_pref_store,
+                                            NULL,  // recommended
+                                            forked_registry->defaults(),
+                                            pref_notifier),
       incognito_pref_store,
-      forked_registry,
+      forked_registry.get(),
       read_error_callback_,
       false);
   return incognito_service;
diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc
index 5185aac..f3d92be 100644
--- a/chrome/browser/prefs/proxy_policy_unittest.cc
+++ b/chrome/browser/prefs/proxy_policy_unittest.cc
@@ -101,8 +101,8 @@ class ProxyPolicyTest : public testing::Test {
       builder.WithManagedPolicies(policy_service_.get());
     scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
         new user_prefs::PrefRegistrySyncable);
-    PrefServiceSyncable* prefs = builder.CreateSyncable(registry);
-    chrome::RegisterUserPrefs(registry);
+    PrefServiceSyncable* prefs = builder.CreateSyncable(registry.get());
+    chrome::RegisterUserPrefs(registry.get());
     return prefs;
   }