Remove Profile from GetInitParams in profile_sync_service_startup_unittest.cc

chrome/browser/sync/profile_sync_service_startup_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 <utility>
 
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/fake_signin_manager_builder.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
-#include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/browser_sync/browser/profile_sync_test_util.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "components/sync_driver/data_type_manager.h"
 #include "components/sync_driver/data_type_manager_mock.h"
 #include "components/sync_driver/glue/sync_backend_host_mock.h"
 #include "components/sync_driver/pref_names.h"
 #include "components/sync_driver/sync_api_component_factory_mock.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "components/syncable_prefs/pref_service_syncable.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/oauth2_token_service.h"
+#include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::SyncBackendHostMock;
 using content::BrowserThread;
 using sync_driver::DataTypeManager;
 using sync_driver::DataTypeManagerMock;
 using testing::_;
 using testing::AnyNumber;
 using testing::DoAll;
 using testing::InvokeArgument;
 using testing::Mock;
 using testing::Return;
 using testing::SaveArg;
 
 namespace {
 
 const char kGaiaId[] = "12345";
 const char kEmail[] = "test_user@gmail.com";
 const char kDummyPassword[] = "";
 
 ProfileSyncService::InitParams GetInitParams(
     scoped_ptr<sync_driver::SyncClient> sync_client,
-    Profile* profile,
     scoped_ptr<SigninManagerWrapper> signin_wrapper,
     ProfileOAuth2TokenService* oauth2_token_service,
-    browser_sync::ProfileSyncServiceStartBehavior start_behavior) {
+    browser_sync::ProfileSyncServiceStartBehavior start_behavior,
+    net::URLRequestContextGetter* url_request_context) {
   ProfileSyncService::InitParams init_params;
 
   init_params.signin_wrapper = std::move(signin_wrapper);
   init_params.oauth2_token_service = oauth2_token_service;
   init_params.start_behavior = start_behavior;
   init_params.sync_client = std::move(sync_client);
   init_params.network_time_update_callback =
       base::Bind(&browser_sync::EmptyNetworkTimeUpdate);
-  init_params.base_directory = profile->GetPath();
-  init_params.url_request_context = profile->GetRequestContext();
-  init_params.debug_identifier = profile->GetDebugName();
-  init_params.channel = chrome::GetChannel();
+  init_params.base_directory = base::FilePath(FILE_PATH_LITERAL("dummyPath"));
+  init_params.url_request_context = url_request_context;
+  init_params.debug_identifier = "dummyDebugName";
+  init_params.channel = version_info::Channel::UNKNOWN;
   init_params.db_thread = content::BrowserThread::GetMessageLoopProxyForThread(
       content::BrowserThread::DB);
   init_params.file_thread =
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::FILE);
   init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
 
   return init_params;
 }
 
@@ skipping 12 matching lines @@
       static_cast<DataTypeManager::ConfigureResult>(result);
   if (result.status == sync_driver::DataTypeManager::ABORTED)
     error_callback.Run(&configure_result);
   service->OnConfigureDone(configure_result);
 }
 
 class TestProfileSyncServiceNoBackup : public ProfileSyncService {
  public:
   TestProfileSyncServiceNoBackup(
       scoped_ptr<sync_driver::SyncClient> sync_client,
-      Profile* profile,
       scoped_ptr<SigninManagerWrapper> signin_wrapper,
       ProfileOAuth2TokenService* oauth2_token_service,
-      browser_sync::ProfileSyncServiceStartBehavior start_behavior)
+      browser_sync::ProfileSyncServiceStartBehavior start_behavior,
+      net::URLRequestContextGetter* url_request_context)
       : ProfileSyncService(GetInitParams(std::move(sync_client),
-                                         profile,
                                          std::move(signin_wrapper),
                                          oauth2_token_service,
-                                         start_behavior)) {}
+                                         start_behavior,
+                                         url_request_context)) {}
 
  protected:
   bool NeedBackup() const override { return false; }
 };
 
 class ProfileSyncServiceStartupTest : public testing::Test {
  public:
   ProfileSyncServiceStartupTest()
       // Purposefully do not use a real FILE thread, see crbug/550013.
       : thread_bundle_(content::TestBrowserThreadBundle::REAL_DB_THREAD |
@@ skipping 23 matching lines @@
 
   void TearDown() override { sync_->RemoveObserver(&observer_); }
 
   static scoped_ptr<KeyedService> BuildService(
       content::BrowserContext* browser_context) {
     Profile* profile = static_cast<Profile*>(browser_context);
     scoped_ptr<browser_sync::ChromeSyncClient> sync_client(
         new browser_sync::ChromeSyncClient(profile));
     sync_client->SetSyncApiComponentFactoryForTesting(
         make_scoped_ptr(new SyncApiComponentFactoryMock()));
+    scoped_refptr<net::URLRequestContextGetter> url_request_context =
+        new net::TestURLRequestContextGetter(
+            base::ThreadTaskRunnerHandle::Get());
     return make_scoped_ptr(new TestProfileSyncServiceNoBackup(
-        std::move(sync_client), profile,
+        std::move(sync_client),
         make_scoped_ptr(new SigninManagerWrapper(
             SigninManagerFactory::GetForProfile(profile))),
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-        browser_sync::MANUAL_START));
+        browser_sync::MANUAL_START, url_request_context.get()));
   }
 
   void CreateSyncService() {
     sync_ = static_cast<ProfileSyncService*>(
         ProfileSyncServiceFactory::GetForProfile(profile_));
     sync_->AddObserver(&observer_);
   }
 
   void IssueTestTokens(const std::string& account_id) {
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)
@@ skipping 81 matching lines @@
         static_cast<FakeSigninManagerForTesting*>(
         SigninManagerFactory::GetForProfile(profile));
     SimulateTestUserSignin(profile, signin, nullptr);
     ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
     EXPECT_TRUE(signin->IsAuthenticated());
     scoped_ptr<browser_sync::ChromeSyncClient> sync_client(
         new browser_sync::ChromeSyncClient(profile));
     sync_client->SetSyncApiComponentFactoryForTesting(
         make_scoped_ptr(new SyncApiComponentFactoryMock()));
+    scoped_refptr<net::URLRequestContextGetter> url_request_context =
+        new net::TestURLRequestContextGetter(
+            base::ThreadTaskRunnerHandle::Get());
     return make_scoped_ptr(new TestProfileSyncServiceNoBackup(
-        std::move(sync_client), profile,
+        std::move(sync_client),
         make_scoped_ptr(new SigninManagerWrapper(signin)), oauth2_token_service,
-        browser_sync::AUTO_START));
+        browser_sync::AUTO_START, url_request_context.get()));
   }
 };
 
 TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   // We've never completed startup.
   profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
   CreateSyncService();
   SetUpSyncBackendHost();
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(0);
@@ skipping 308 matching lines @@
   profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
 
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   sync_->Initialize();
 
   sync_->SetSetupInProgress(true);
   IssueTestTokens(account_id);
   sync_->SetSetupInProgress(false);
   EXPECT_FALSE(sync_->IsSyncActive());
 }