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

chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc

 // Copyright 2014 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/ui/sync/one_click_signin_sync_observer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
-#include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/startup_controller.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 38 matching lines @@
     first_setup_in_progress_ = in_progress;
   }
 
   void set_sync_initialized(bool initialized) {
     sync_initialized_ = initialized;
   }
 
  private:
   explicit OneClickTestProfileSyncService(Profile* profile)
       : TestProfileSyncService(
-          scoped_ptr<ProfileSyncComponentsFactory>(
-              new ProfileSyncComponentsFactoryMock()),
+          NULL,
           profile,
           SigninManagerFactory::GetForProfile(profile),
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
           browser_sync::MANUAL_START),
         first_setup_in_progress_(false),
         sync_initialized_(false) {}
 
   bool first_setup_in_progress_;
   bool sync_initialized_;
 };
@@ skipping 149 matching lines @@
        OnSyncStateChanged_SyncConfiguredSuccessfully_SourceIsSettings) {
   GURL continue_url = signin::GetPromoURL(signin::SOURCE_SETTINGS, false);
   CreateSyncObserver(continue_url.spec());
   sync_service_->set_first_setup_in_progress(false);
   sync_service_->set_sync_initialized(true);
 
   EXPECT_CALL(*web_contents_observer_, AboutToNavigateRenderView(_)).Times(0);
   sync_service_->NotifyObservers();
   EXPECT_NE(GURL(kContinueUrl), web_contents()->GetVisibleURL());
 }