Revert of Sync: Refactoring of DEVICE_INFO syncable type - Part 1

chrome/browser/sync/profile_sync_service_startup_unittest.cc

Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index c00315e2e4d59348e04411057f49ac2847cba135..91ed7f8413ef30785be0303d1d39f422e229f396 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -99,8 +99,7 @@
   static KeyedService* BuildService(content::BrowserContext* browser_context) {
     Profile* profile = static_cast<Profile*>(browser_context);
     return new ProfileSyncService(
-        scoped_ptr<ProfileSyncComponentsFactory>(
-            new ProfileSyncComponentsFactoryMock()),
+        new ProfileSyncComponentsFactoryMock(),
         profile,
         make_scoped_ptr(new SupervisedUserSigninManagerWrapper(
             profile, SigninManagerFactory::GetForProfile(profile))),
@@ -184,8 +183,7 @@
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
     EXPECT_FALSE(signin->GetAuthenticatedUsername().empty());
     return new ProfileSyncService(
-        scoped_ptr<ProfileSyncComponentsFactory>(
-            new ProfileSyncComponentsFactoryMock()),
+        new ProfileSyncComponentsFactoryMock(),
         profile,
         make_scoped_ptr(new SupervisedUserSigninManagerWrapper(profile,
                                                                signin)),