Convert implicit scoped_refptr constructor calls to explicit ones, part 1

chrome/browser/sync/profile_sync_service_autofill_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 772 matching lines @@
   ASSERT_TRUE(task.success());
 
   AutofillEntry added_entry(MakeAutofillEntry("added", "entry", 1));
   std::vector<base::Time> timestamps(added_entry.timestamps());
 
   EXPECT_CALL(web_database_, GetAutofillTimestamps(_, _, _)).
       WillOnce(DoAll(SetArgumentPointee<2>(timestamps), Return(true)));
 
   AutofillChangeList changes;
   changes.push_back(AutofillChange(AutofillChange::ADD, added_entry.key()));
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_ENTRIES_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillChangeList>(&changes));
 
   std::vector<AutofillEntry> new_sync_entries;
   std::vector<AutoFillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                            &new_sync_profiles));
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(added_entry == new_sync_entries[0]);
 }
 
 TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeAddProfile) {
   EXPECT_CALL(web_database_, GetAllAutofillEntries(_)).WillOnce(Return(true));
   EXPECT_CALL(web_database_, GetAutoFillProfiles(_)).WillOnce(Return(true));
   EXPECT_CALL(*personal_data_manager_, Refresh());
   SetIdleChangeProcessorExpectations();
   CreateRootTask task(this, syncable::AUTOFILL);
   StartSyncService(&task, false);
   ASSERT_TRUE(task.success());
 
   AutoFillProfile added_profile(string16(), 0);
   autofill_test::SetProfileInfo(&added_profile,
       "Billing", "Josephine", "Alicia", "Saenz",
       "joewayne@me.xyz", "Fox", "1212 Center.", "Bld. 5", "Orlando", "FL",
       "32801", "US", "19482937549", "13502849239");
 
   AutofillProfileChange change(AutofillProfileChange::ADD,
       added_profile.Label(), &added_profile, string16());
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_PROFILE_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillProfileChange>(&change));
 
   std::vector<AutofillEntry> new_sync_entries;
   std::vector<AutoFillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                            &new_sync_profiles));
   ASSERT_EQ(1U, new_sync_profiles.size());
   // TODO(dhollowa): Replace with |AutoFillProfile::Compare|.
@@ skipping 31 matching lines @@
 
   AutofillProfileChange change(AutofillProfileChange::ADD,
       added_profile.Label(), &added_profile, string16());
 
   AutoFillProfile relabelled_profile;
   EXPECT_CALL(web_database_, UpdateAutoFillProfile(
       ProfileMatchesExceptLabel(added_profile))).
       WillOnce(DoAll(SaveArg<0>(&relabelled_profile), Return(true)));
   EXPECT_CALL(*personal_data_manager_, Refresh());
 
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_PROFILE_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillProfileChange>(&change));
 
   std::vector<AutofillEntry> new_sync_entries;
   std::vector<AutoFillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                            &new_sync_profiles));
   ASSERT_EQ(2U, new_sync_profiles.size());
   sync_profile.set_unique_id(0);  // The sync DB doesn't store IDs.
@@ skipping 18 matching lines @@
 
   AutofillEntry updated_entry(MakeAutofillEntry("my", "entry", 1, 2));
   std::vector<base::Time> timestamps(updated_entry.timestamps());
 
   EXPECT_CALL(web_database_, GetAutofillTimestamps(_, _, _)).
       WillOnce(DoAll(SetArgumentPointee<2>(timestamps), Return(true)));
 
   AutofillChangeList changes;
   changes.push_back(AutofillChange(AutofillChange::UPDATE,
                                    updated_entry.key()));
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_ENTRIES_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillChangeList>(&changes));
 
   std::vector<AutofillEntry> new_sync_entries;
   std::vector<AutoFillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                            &new_sync_profiles));
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(updated_entry == new_sync_entries[0]);
@@ skipping 18 matching lines @@
 
   AutoFillProfile update_profile(string16(), 0);
   autofill_test::SetProfileInfo(&update_profile,
       "Billing", "Changin'", "Mah", "Namez",
       "joewayne@me.xyz", "Fox", "1212 Center.", "Bld. 5", "Orlando", "FL",
       "32801", "US", "19482937549", "13502849239");
 
   AutofillProfileChange change(AutofillProfileChange::UPDATE,
                                update_profile.Label(), &update_profile,
                                ASCIIToUTF16("Billing"));
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_PROFILE_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillProfileChange>(&change));
 
   std::vector<AutofillEntry> new_sync_entries;
   std::vector<AutoFillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                            &new_sync_profiles));
   ASSERT_EQ(1U, new_sync_profiles.size());
   // TODO(dhollowa): Replace with |AutoFillProfile::Compare|.
@@ skipping 19 matching lines @@
 
   AutoFillProfile update_profile(string16(), 0);
   autofill_test::SetProfileInfo(&update_profile,
       "TRYIN 2 FOOL U", "Josephine", "Alicia", "Saenz",
       "joewayne@me.xyz", "Fox", "1212 Center.", "Bld. 5", "Orlando", "FL",
       "32801", "US", "19482937549", "13502849239");
 
   AutofillProfileChange change(AutofillProfileChange::UPDATE,
                                update_profile.Label(), &update_profile,
                                ASCIIToUTF16("Billing"));
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_PROFILE_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillProfileChange>(&change));
 
   std::vector<AutofillEntry> new_sync_entries;
   std::vector<AutoFillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                            &new_sync_profiles));
   ASSERT_EQ(1U, new_sync_profiles.size());
   // TODO(dhollowa): Replace with |AutoFillProfile::Compare|.
@@ skipping 38 matching lines @@
 
     AutoFillProfile relabelled_profile;
     EXPECT_CALL(web_database_, UpdateAutoFillProfile(
         ProfileMatchesExceptLabel(josephine_update))).
         WillOnce(DoAll(SaveArg<0>(&relabelled_profile), Return(true)));
     EXPECT_CALL(*personal_data_manager_, Refresh());
 
     AutofillProfileChange change(AutofillProfileChange::UPDATE,
                                  josephine_update.Label(), &josephine_update,
                                  josephine.Label());
-    scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+    scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
     notifier->Notify(NotificationType::AUTOFILL_PROFILE_CHANGED,
                      Source<WebDataService>(web_data_service_.get()),
                      Details<AutofillProfileChange>(&change));
     MessageLoop::current()->RunAllPending();  // Run the Refresh task.
     Mock::VerifyAndClearExpectations(&web_database_);
 
     std::vector<AutofillEntry> new_sync_entries;
     std::vector<AutoFillProfile> new_sync_profiles;
     ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                              &new_sync_profiles));
@@ skipping 17 matching lines @@
       WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
   EXPECT_CALL(web_database_, GetAutoFillProfiles(_)).WillOnce(Return(true));
   EXPECT_CALL(*personal_data_manager_, Refresh());
   CreateRootTask task(this, syncable::AUTOFILL);
   StartSyncService(&task, false);
   ASSERT_TRUE(task.success());
 
   AutofillChangeList changes;
   changes.push_back(AutofillChange(AutofillChange::REMOVE,
                                    original_entry.key()));
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_ENTRIES_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillChangeList>(&changes));
 
   std::vector<AutofillEntry> new_sync_entries;
   std::vector<AutoFillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                            &new_sync_profiles));
   ASSERT_EQ(0U, new_sync_entries.size());
 }
@@ skipping 19 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutoFillProfile> sync_profiles;
   sync_profiles.push_back(sync_profile);
   AddAutofillEntriesTask task(this, sync_entries, sync_profiles);
   EXPECT_CALL(*personal_data_manager_, Refresh());
   StartSyncService(&task, false);
   ASSERT_TRUE(task.success());
 
   AutofillProfileChange change(AutofillProfileChange::REMOVE,
                                sync_profile.Label(), NULL, string16());
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_PROFILE_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillProfileChange>(&change));
 
   std::vector<AutofillEntry> new_sync_entries;
   std::vector<AutoFillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&new_sync_entries,
                                            &new_sync_profiles));
   ASSERT_EQ(0U, new_sync_entries.size());
 }
 
 TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeError) {
   EXPECT_CALL(web_database_, GetAllAutofillEntries(_)).WillOnce(Return(true));
   EXPECT_CALL(web_database_, GetAutoFillProfiles(_)).WillOnce(Return(true));
   EXPECT_CALL(*personal_data_manager_, Refresh());
   CreateRootTask task(this, syncable::AUTOFILL);
   StartSyncService(&task, false);
   ASSERT_TRUE(task.success());
 
   // Inject an evil entry into the sync db to conflict with the same
   // entry added by the user.
   AutofillEntry evil_entry(MakeAutofillEntry("evil", "entry", 1));
   ASSERT_TRUE(AddAutofillSyncNode(evil_entry));
 
   AutofillChangeList changes;
   changes.push_back(AutofillChange(AutofillChange::ADD,
                                    evil_entry.key()));
-  scoped_refptr<ThreadNotifier> notifier = new ThreadNotifier(&db_thread_);
+  scoped_refptr<ThreadNotifier> notifier(new ThreadNotifier(&db_thread_));
   notifier->Notify(NotificationType::AUTOFILL_ENTRIES_CHANGED,
                    Source<WebDataService>(web_data_service_.get()),
                    Details<AutofillChangeList>(&changes));
 
   // Wait for the PPS to shut everything down and signal us.
   ProfileSyncServiceObserverMock observer;
   service_->AddObserver(&observer);
   EXPECT_CALL(observer, OnStateChanged()).WillOnce(QuitUIMessageLoop());
   MessageLoop::current()->Run();
   EXPECT_TRUE(service_->unrecoverable_error_detected());
@@ skipping 11 matching lines @@
   EXPECT_CALL(web_database_, UpdateAutofillEntries(_)).
       WillRepeatedly(Return(true));
   EXPECT_CALL(*personal_data_manager_, Refresh()).Times(3);
   CreateRootTask task(this, syncable::AUTOFILL);
   StartSyncService(&task, false);
   ASSERT_TRUE(task.success());
 
   // (true, false) means we have to reset after |Signal|, init to unsignaled.
   scoped_ptr<WaitableEvent> wait_for_start(new WaitableEvent(true, false));
   scoped_ptr<WaitableEvent> wait_for_syncapi(new WaitableEvent(true, false));
-  scoped_refptr<FakeServerUpdater> updater = new FakeServerUpdater(
-      service_.get(), &wait_for_start, &wait_for_syncapi);
+  scoped_refptr<FakeServerUpdater> updater(new FakeServerUpdater(
+      service_.get(), &wait_for_start, &wait_for_syncapi));
 
   // This server side update will stall waiting for CommitWaiter.
   updater->CreateNewEntry(MakeAutofillEntry("server", "entry", 1));
   wait_for_start->Wait();
 
   AutofillEntry syncapi_entry(MakeAutofillEntry("syncapi", "entry", 2));
   ASSERT_TRUE(AddAutofillSyncNode(syncapi_entry));
   VLOG(1) << "Syncapi update finished.";
 
   // If we reach here, it means syncapi succeeded and we didn't deadlock. Yay!
   // Signal FakeServerUpdater that it can complete.
   wait_for_syncapi->Signal();
 
   // Make another entry to ensure nothing broke afterwards and wait for finish
   // to clean up.
   updater->CreateNewEntryAndWait(MakeAutofillEntry("server2", "entry2", 3));
 
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutoFillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     VLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
             << ", " << sync_entries[i].key().value();
   }
 }