| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 14 #include "base/prefs/pref_registry_simple.h" | |
| 15 #include "base/prefs/testing_pref_service.h" | |
| 16 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
| 17 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 18 #include "base/test/histogram_tester.h" | 16 #include "base/test/histogram_tester.h" |
| 19 #include "base/thread_task_runner_handle.h" | 17 #include "base/thread_task_runner_handle.h" |
| 18 #include "components/prefs/pref_registry_simple.h" |
| 19 #include "components/prefs/testing_pref_service.h" |
| 20 #include "components/signin/core/browser/account_tracker_service.h" | 20 #include "components/signin/core/browser/account_tracker_service.h" |
| 21 #include "components/signin/core/browser/gaia_cookie_manager_service.h" | 21 #include "components/signin/core/browser/gaia_cookie_manager_service.h" |
| 22 #include "components/signin/core/browser/test_signin_client.h" | 22 #include "components/signin/core/browser/test_signin_client.h" |
| 23 #include "components/signin/core/common/signin_pref_names.h" | 23 #include "components/signin/core/common/signin_pref_names.h" |
| 24 #include "google_apis/gaia/fake_oauth2_token_service.h" | 24 #include "google_apis/gaia/fake_oauth2_token_service.h" |
| 25 #include "google_apis/gaia/gaia_constants.h" | 25 #include "google_apis/gaia/gaia_constants.h" |
| 26 #include "google_apis/gaia/gaia_urls.h" | 26 #include "google_apis/gaia/gaia_urls.h" |
| 27 #include "net/url_request/test_url_fetcher_factory.h" | 27 #include "net/url_request/test_url_fetcher_factory.h" |
| 28 #include "net/url_request/url_request_test_util.h" | 28 #include "net/url_request/url_request_test_util.h" |
| 29 #include "testing/gmock/include/gmock/gmock.h" | 29 #include "testing/gmock/include/gmock/gmock.h" |
| (...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 | 705 |
| 706 helper.external_cc_result_fetcher_for_testing()->Start(); | 706 helper.external_cc_result_fetcher_for_testing()->Start(); |
| 707 | 707 |
| 708 EXPECT_CALL(helper, StartFetchingUbertoken()); | 708 EXPECT_CALL(helper, StartFetchingUbertoken()); |
| 709 helper.AddAccountToCookie("acc2@gmail.com"); | 709 helper.AddAccountToCookie("acc2@gmail.com"); |
| 710 // There is already a ExternalCCResultFetch underway. This will trigger | 710 // There is already a ExternalCCResultFetch underway. This will trigger |
| 711 // StartFetchingMergeSession. | 711 // StartFetchingMergeSession. |
| 712 EXPECT_CALL(helper, StartFetchingMergeSession()); | 712 EXPECT_CALL(helper, StartFetchingMergeSession()); |
| 713 SimulateUbertokenSuccess(&helper, "token3"); | 713 SimulateUbertokenSuccess(&helper, "token3"); |
| 714 } | 714 } |
| OLD | NEW |