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

chrome/browser/sync/test_profile_sync_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 55 matching lines @@
   base::Closure callback_;
 };
 
 }  // namespace browser_sync
 
 class TestProfileSyncService : public ProfileSyncService {
  public:
   // TODO(tim): Add ability to inject TokenService alongside SigninManager.
   // TODO(rogerta): what does above comment mean?
   TestProfileSyncService(
-      scoped_ptr<ProfileSyncComponentsFactory> factory,
+      ProfileSyncComponentsFactory* factory,
       Profile* profile,
       SigninManagerBase* signin,
       ProfileOAuth2TokenService* oauth2_token_service,
       browser_sync::ProfileSyncServiceStartBehavior behavior);
 
   virtual ~TestProfileSyncService();
 
   virtual void OnConfigureDone(
       const browser_sync::DataTypeManager::ConfigureResult& result) OVERRIDE;
 
@@ skipping 17 matching lines @@
   // js messages on UI loop when it's being destroyed, which are not deleted
   // and cause memory leak in test.
   virtual syncer::WeakHandle<syncer::JsEventHandler> GetJsEventHandler()
       OVERRIDE;
 
  private:
   syncer::TestIdFactory id_factory_;
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_