chrome/browser/sync/profile_sync_service_startup_unittest.cc - Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

Side by Side Diff: chrome/browser/sync/profile_sync_service_startup_unittest.cc

Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_strings

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/files/file_util.h"	5 #include "base/files/file_util.h"

6 #include "base/memory/scoped_ptr.h"	6 #include "base/memory/scoped_ptr.h"

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "chrome/browser/signin/account_tracker_service_factory.h"	9 #include "chrome/browser/signin/account_tracker_service_factory.h"

10 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"	10 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"

11 #include "chrome/browser/signin/fake_signin_manager_builder.h"	11 #include "chrome/browser/signin/fake_signin_manager_builder.h"

12 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	12 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

13 #include "chrome/browser/signin/signin_manager_factory.h"	13 #include "chrome/browser/signin/signin_manager_factory.h"

14 #include "chrome/browser/sync/chrome_sync_client.h"	14 #include "chrome/browser/sync/chrome_sync_client.h"

15 #include "chrome/browser/sync/glue/sync_backend_host_mock.h"

16 #include "chrome/browser/sync/profile_sync_service.h"	15 #include "chrome/browser/sync/profile_sync_service.h"

17 #include "chrome/browser/sync/profile_sync_service_factory.h"	16 #include "chrome/browser/sync/profile_sync_service_factory.h"

18 #include "chrome/browser/sync/profile_sync_test_util.h"	17 #include "chrome/browser/sync/profile_sync_test_util.h"

19 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"	18 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"

20 #include "chrome/common/channel_info.h"	19 #include "chrome/common/channel_info.h"

21 #include "chrome/common/pref_names.h"	20 #include "chrome/common/pref_names.h"

22 #include "chrome/test/base/testing_browser_process.h"	21 #include "chrome/test/base/testing_browser_process.h"

23 #include "chrome/test/base/testing_profile.h"	22 #include "chrome/test/base/testing_profile.h"

24 #include "chrome/test/base/testing_profile_manager.h"	23 #include "chrome/test/base/testing_profile_manager.h"

25 #include "components/signin/core/browser/account_tracker_service.h"	24 #include "components/signin/core/browser/account_tracker_service.h"

26 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"	25 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"

27 #include "components/signin/core/browser/profile_oauth2_token_service.h"	26 #include "components/signin/core/browser/profile_oauth2_token_service.h"

28 #include "components/signin/core/browser/signin_manager.h"	27 #include "components/signin/core/browser/signin_manager.h"

29 #include "components/signin/core/common/signin_pref_names.h"	28 #include "components/signin/core/common/signin_pref_names.h"

30 #include "components/sync_driver/data_type_manager.h"	29 #include "components/sync_driver/data_type_manager.h"

31 #include "components/sync_driver/data_type_manager_mock.h"	30 #include "components/sync_driver/data_type_manager_mock.h"

	31 #include "components/sync_driver/glue/sync_backend_host_mock.h"

32 #include "components/sync_driver/pref_names.h"	32 #include "components/sync_driver/pref_names.h"

33 #include "components/sync_driver/sync_api_component_factory_mock.h"	33 #include "components/sync_driver/sync_api_component_factory_mock.h"

34 #include "components/sync_driver/sync_prefs.h"	34 #include "components/sync_driver/sync_prefs.h"

35 #include "components/syncable_prefs/pref_service_syncable.h"	35 #include "components/syncable_prefs/pref_service_syncable.h"

36 #include "content/public/test/test_browser_thread_bundle.h"	36 #include "content/public/test/test_browser_thread_bundle.h"

37 #include "content/public/test/test_utils.h"	37 #include "content/public/test/test_utils.h"

38 #include "google_apis/gaia/gaia_auth_consumer.h"	38 #include "google_apis/gaia/gaia_auth_consumer.h"

39 #include "google_apis/gaia/gaia_constants.h"	39 #include "google_apis/gaia/gaia_constants.h"

40 #include "google_apis/gaia/oauth2_token_service.h"	40 #include "google_apis/gaia/oauth2_token_service.h"

41 #include "testing/gmock/include/gmock/gmock.h"	41 #include "testing/gmock/include/gmock/gmock.h"

(...skipping 560 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
602 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);	602 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);

603	603

604 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());	604 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());

605 sync_->Initialize();	605 sync_->Initialize();

606	606

607 sync_->SetSetupInProgress(true);	607 sync_->SetSetupInProgress(true);

608 IssueTestTokens(account_id);	608 IssueTestTokens(account_id);

609 sync_->SetSetupInProgress(false);	609 sync_->SetSetupInProgress(false);

610 EXPECT_FALSE(sync_->IsSyncActive());	610 EXPECT_FALSE(sync_->IsSyncActive());

611 }	611 }

OLD	NEW