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 "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 5 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
6 | 6 |
7 #include <cstddef> | 7 #include <cstddef> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <ostream> | 9 #include <ostream> |
10 #include <sstream> | 10 #include <sstream> |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" | 22 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" |
23 #include "chrome/browser/ui/browser.h" | 23 #include "chrome/browser/ui/browser.h" |
24 #include "chrome/browser/ui/browser_finder.h" | 24 #include "chrome/browser/ui/browser_finder.h" |
25 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h" | 25 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h" |
26 #include "chrome/common/channel_info.h" | 26 #include "chrome/common/channel_info.h" |
27 #include "chrome/common/chrome_switches.h" | 27 #include "chrome/common/chrome_switches.h" |
28 #include "components/invalidation/impl/p2p_invalidation_service.h" | 28 #include "components/invalidation/impl/p2p_invalidation_service.h" |
29 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 29 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
30 #include "components/signin/core/browser/signin_manager_base.h" | 30 #include "components/signin/core/browser/signin_manager_base.h" |
31 #include "components/sync_driver/about_sync_util.h" | 31 #include "components/sync_driver/about_sync_util.h" |
32 #include "components/sync_driver/data_type_controller.h" | |
33 #include "google_apis/gaia/gaia_constants.h" | 32 #include "google_apis/gaia/gaia_constants.h" |
34 #include "sync/internal_api/public/base/progress_marker_map.h" | 33 #include "sync/internal_api/public/base/progress_marker_map.h" |
35 #include "sync/internal_api/public/util/sync_string_conversions.h" | 34 #include "sync/internal_api/public/util/sync_string_conversions.h" |
36 | 35 |
37 using syncer::sessions::SyncSessionSnapshot; | 36 using syncer::sessions::SyncSessionSnapshot; |
38 | 37 |
39 namespace { | 38 namespace { |
40 | 39 |
41 std::string GetGaiaIdForUsername(const std::string& username) { | 40 std::string GetGaiaIdForUsername(const std::string& username) { |
42 return "gaia-id-" + username; | 41 return "gaia-id-" + username; |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
471 | 470 |
472 std::string ProfileSyncServiceHarness::GetServiceStatus() { | 471 std::string ProfileSyncServiceHarness::GetServiceStatus() { |
473 scoped_ptr<base::DictionaryValue> value( | 472 scoped_ptr<base::DictionaryValue> value( |
474 sync_ui_util::ConstructAboutInformation( | 473 sync_ui_util::ConstructAboutInformation( |
475 service(), service()->signin(), chrome::GetChannel())); | 474 service(), service()->signin(), chrome::GetChannel())); |
476 std::string service_status; | 475 std::string service_status; |
477 base::JSONWriter::WriteWithOptions( | 476 base::JSONWriter::WriteWithOptions( |
478 *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status); | 477 *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status); |
479 return service_status; | 478 return service_status; |
480 } | 479 } |
OLD | NEW |