chrome/browser/sync/test/integration/profile_sync_service_harness.cc - Issue 1334173006: Move sync_internals resources and constants to //components.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/test/integration/profile_sync_service_harness.cc

Issue 1334173006: Move sync_internals resources and constants to //components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gcmInternals

Patch Set: Update resource_ids Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/profile_sync_service_android.cc ('k') | chrome/browser/ui/webui/sync_internals_message_handler.cc » ('j') | components/sync_driver/about_sync_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/profile_sync_service_harness.cc

diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

index 1e394570325bf652a71c6e84939f71170951e0db..eabd844f8079c9b88a7d2150941295bd9407c576 100644

--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

@@ -470,8 +470,8 @@ bool ProfileSyncServiceHarness::IsTypePreferred(syncer::ModelType type) {

std::string ProfileSyncServiceHarness::GetServiceStatus() {

scoped_ptr<base::DictionaryValue> value(

- sync_ui_util::ConstructAboutInformation(

- service(), service()->signin(), chrome::GetChannel()));

+ sync_driver::ConstructAboutInformation(service(), service()->signin(),

+ chrome::GetChannel()));

std::string service_status;

base::JSONWriter::WriteWithOptions(

*value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status);