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

chrome/browser/sync/profile_sync_service_factory.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 "chrome/browser/sync/profile_sync_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ skipping 111 matching lines @@
   // TODO(tim): Currently, AUTO/MANUAL settings refer to the *first* time sync
   // is set up and *not* a browser restart for a manual-start platform (where
   // sync has already been set up, and should be able to start without user
   // intervention). We can get rid of the browser_default eventually, but
   // need to take care that ProfileSyncService doesn't get tripped up between
   // those two cases. Bug 88109.
   browser_sync::ProfileSyncServiceStartBehavior behavior =
       browser_defaults::kSyncAutoStarts ? browser_sync::AUTO_START
                                         : browser_sync::MANUAL_START;
   ProfileSyncService* pss = new ProfileSyncService(
-      scoped_ptr<ProfileSyncComponentsFactory>(
-          new ProfileSyncComponentsFactoryImpl(
-              profile,
-              CommandLine::ForCurrentProcess(),
-              sync_service_url,
-              token_service,
-              url_request_context_getter)),
+      new ProfileSyncComponentsFactoryImpl(profile,
+                                           CommandLine::ForCurrentProcess(),
+                                           sync_service_url,
+                                           token_service,
+                                           url_request_context_getter),
       profile,
       signin_wrapper.Pass(),
       token_service,
       behavior);
 
   pss->factory()->RegisterDataTypes(pss);
   pss->Initialize();
   return pss;
 }
 
 // static
 bool ProfileSyncServiceFactory::HasProfileSyncService(Profile* profile) {
   return GetInstance()->GetServiceForBrowserContext(profile, false) != NULL;
 }