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/macros.h" |
6 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
7 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
8 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
9 #include "base/test/histogram_tester.h" | 10 #include "base/test/histogram_tester.h" |
10 #include "base/time/time.h" | 11 #include "base/time/time.h" |
11 #include "build/build_config.h" | 12 #include "build/build_config.h" |
12 #include "chrome/browser/signin/account_reconcilor_factory.h" | 13 #include "chrome/browser/signin/account_reconcilor_factory.h" |
13 #include "chrome/browser/signin/account_tracker_service_factory.h" | 14 #include "chrome/browser/signin/account_tracker_service_factory.h" |
14 #include "chrome/browser/signin/chrome_signin_client_factory.h" | 15 #include "chrome/browser/signin/chrome_signin_client_factory.h" |
15 #include "chrome/browser/signin/fake_gaia_cookie_manager_service.h" | 16 #include "chrome/browser/signin/fake_gaia_cookie_manager_service.h" |
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 base::RunLoop().RunUntilIdle(); | 902 base::RunLoop().RunUntilIdle(); |
902 ASSERT_FALSE(reconcilor->is_reconcile_started_); | 903 ASSERT_FALSE(reconcilor->is_reconcile_started_); |
903 ASSERT_FALSE(reconcilor->error_during_last_reconcile_); | 904 ASSERT_FALSE(reconcilor->error_during_last_reconcile_); |
904 } | 905 } |
905 | 906 |
906 #endif // OS_IOS | 907 #endif // OS_IOS |
907 | 908 |
908 INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled, | 909 INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled, |
909 AccountReconcilorTest, | 910 AccountReconcilorTest, |
910 testing::Bool()); | 911 testing::Bool()); |
OLD | NEW |