Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(976)

Side by Side Diff: chrome/browser/sync/test/integration/profile_sync_service_harness.cc

Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sd-a
Patch Set: Full change rebased on static lib. Created 4 years, 4 months 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
OLDNEW
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 12 matching lines...) Expand all
23 #include "chrome/browser/ui/browser_finder.h" 23 #include "chrome/browser/ui/browser_finder.h"
24 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h" 24 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h"
25 #include "chrome/common/channel_info.h" 25 #include "chrome/common/channel_info.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "components/browser_sync/browser/profile_sync_service.h" 27 #include "components/browser_sync/browser/profile_sync_service.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/base/progress_marker_map.h" 31 #include "components/sync/base/progress_marker_map.h"
32 #include "components/sync/base/sync_string_conversions.h" 32 #include "components/sync/base/sync_string_conversions.h"
33 #include "components/sync_driver/about_sync_util.h" 33 #include "components/sync/driver/about_sync_util.h"
34 #include "google_apis/gaia/gaia_constants.h" 34 #include "google_apis/gaia/gaia_constants.h"
35 35
36 using syncer::sessions::SyncSessionSnapshot; 36 using syncer::sessions::SyncSessionSnapshot;
37 37
38 namespace { 38 namespace {
39 39
40 std::string GetGaiaIdForUsername(const std::string& username) { 40 std::string GetGaiaIdForUsername(const std::string& username) {
41 return "gaia-id-" + username; 41 return "gaia-id-" + username;
42 } 42 }
43 43
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 474
475 std::string ProfileSyncServiceHarness::GetServiceStatus() { 475 std::string ProfileSyncServiceHarness::GetServiceStatus() {
476 std::unique_ptr<base::DictionaryValue> value( 476 std::unique_ptr<base::DictionaryValue> value(
477 sync_driver::sync_ui_util::ConstructAboutInformation( 477 sync_driver::sync_ui_util::ConstructAboutInformation(
478 service(), service()->signin(), chrome::GetChannel())); 478 service(), service()->signin(), chrome::GetChannel()));
479 std::string service_status; 479 std::string service_status;
480 base::JSONWriter::WriteWithOptions( 480 base::JSONWriter::WriteWithOptions(
481 *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status); 481 *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status);
482 return service_status; 482 return service_status;
483 } 483 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/p2p_sync_refresher.h ('k') | chrome/browser/sync/test/integration/sessions_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698