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

chrome/browser/sync/profile_sync_service_unittest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 175 matching lines @@
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)
         ->UpdateCredentials("test", "oauth2_login_token");
   }
 
   void CreateService(ProfileSyncServiceStartBehavior behavior) {
     SigninManagerBase* signin =
         SigninManagerFactory::GetForProfile(profile_);
     signin->SetAuthenticatedUsername("test");
     ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
-    components_factory_ = new ProfileSyncComponentsFactoryMock();
+    components_factory_ = new StrictMock<ProfileSyncComponentsFactoryMock>();
     service_.reset(new ProfileSyncService(
-        scoped_ptr<ProfileSyncComponentsFactory>(components_factory_),
+        components_factory_,
         profile_,
         make_scoped_ptr(new SupervisedUserSigninManagerWrapper(profile_,
                                                                signin)),
         oauth2_token_service,
         behavior));
     service_->SetClearingBrowseringDataForTesting(
         base::Bind(&ProfileSyncServiceTest::ClearBrowsingDataCallback,
                    base::Unretained(this)));
   }
 
@@ skipping 406 matching lines @@
   // See that we can override the URL with a flag.
   CommandLine command_line(
       base::FilePath(base::FilePath(FILE_PATH_LITERAL("chrome.exe"))));
   command_line.AppendSwitchASCII(switches::kSyncServiceURL, "https://foo/bar");
   EXPECT_EQ("https://foo/bar",
             ProfileSyncService::GetSyncServiceURL(command_line).spec());
 }
 
 }  // namespace
 }  // namespace browser_sync