| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "base/test/histogram_tester.h" | 9 #include "base/test/histogram_tester.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 #include "chrome/browser/prefs/pref_service_syncable.h" | |
| 13 #include "chrome/browser/signin/account_reconcilor_factory.h" | 12 #include "chrome/browser/signin/account_reconcilor_factory.h" |
| 14 #include "chrome/browser/signin/account_tracker_service_factory.h" | 13 #include "chrome/browser/signin/account_tracker_service_factory.h" |
| 15 #include "chrome/browser/signin/chrome_signin_client_factory.h" | 14 #include "chrome/browser/signin/chrome_signin_client_factory.h" |
| 16 #include "chrome/browser/signin/fake_gaia_cookie_manager_service.h" | 15 #include "chrome/browser/signin/fake_gaia_cookie_manager_service.h" |
| 17 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" | 16 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" |
| 18 #include "chrome/browser/signin/fake_signin_manager_builder.h" | 17 #include "chrome/browser/signin/fake_signin_manager_builder.h" |
| 19 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" | 18 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" |
| 20 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 19 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| 21 #include "chrome/browser/signin/signin_manager_factory.h" | 20 #include "chrome/browser/signin/signin_manager_factory.h" |
| 22 #include "chrome/browser/signin/test_signin_client_builder.h" | 21 #include "chrome/browser/signin/test_signin_client_builder.h" |
| 23 #include "chrome/test/base/testing_browser_process.h" | 22 #include "chrome/test/base/testing_browser_process.h" |
| 24 #include "chrome/test/base/testing_profile.h" | 23 #include "chrome/test/base/testing_profile.h" |
| 25 #include "chrome/test/base/testing_profile_manager.h" | 24 #include "chrome/test/base/testing_profile_manager.h" |
| 26 #include "components/signin/core/browser/account_reconcilor.h" | 25 #include "components/signin/core/browser/account_reconcilor.h" |
| 27 #include "components/signin/core/browser/account_tracker_service.h" | 26 #include "components/signin/core/browser/account_tracker_service.h" |
| 28 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" | 27 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" |
| 29 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 28 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
| 30 #include "components/signin/core/browser/signin_manager.h" | 29 #include "components/signin/core/browser/signin_manager.h" |
| 31 #include "components/signin/core/browser/signin_metrics.h" | 30 #include "components/signin/core/browser/signin_metrics.h" |
| 32 #include "components/signin/core/browser/test_signin_client.h" | 31 #include "components/signin/core/browser/test_signin_client.h" |
| 33 #include "components/signin/core/common/profile_management_switches.h" | 32 #include "components/signin/core/common/profile_management_switches.h" |
| 34 #include "components/signin/core/common/signin_switches.h" | 33 #include "components/signin/core/common/signin_switches.h" |
| 34 #include "components/syncable_prefs/pref_service_syncable.h" |
| 35 #include "content/public/test/test_browser_thread_bundle.h" | 35 #include "content/public/test/test_browser_thread_bundle.h" |
| 36 #include "google_apis/gaia/fake_oauth2_token_service_delegate.h" | 36 #include "google_apis/gaia/fake_oauth2_token_service_delegate.h" |
| 37 #include "google_apis/gaia/gaia_constants.h" | 37 #include "google_apis/gaia/gaia_constants.h" |
| 38 #include "google_apis/gaia/gaia_urls.h" | 38 #include "google_apis/gaia/gaia_urls.h" |
| 39 #include "net/url_request/test_url_fetcher_factory.h" | 39 #include "net/url_request/test_url_fetcher_factory.h" |
| 40 #include "testing/gmock/include/gmock/gmock.h" | 40 #include "testing/gmock/include/gmock/gmock.h" |
| 41 #include "testing/gtest/include/gtest/gtest.h" | 41 #include "testing/gtest/include/gtest/gtest.h" |
| 42 | 42 |
| 43 namespace { | 43 namespace { |
| 44 | 44 |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 base::RunLoop().RunUntilIdle(); | 856 base::RunLoop().RunUntilIdle(); |
| 857 ASSERT_FALSE(reconcilor->is_reconcile_started_); | 857 ASSERT_FALSE(reconcilor->is_reconcile_started_); |
| 858 ASSERT_FALSE(reconcilor->error_during_last_reconcile_); | 858 ASSERT_FALSE(reconcilor->error_during_last_reconcile_); |
| 859 } | 859 } |
| 860 | 860 |
| 861 #endif // OS_IOS | 861 #endif // OS_IOS |
| 862 | 862 |
| 863 INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled, | 863 INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled, |
| 864 AccountReconcilorTest, | 864 AccountReconcilorTest, |
| 865 testing::Bool()); | 865 testing::Bool()); |
| OLD | NEW |