chrome/browser/sync/test/integration/two_client_themes_sync_test.cc - Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace

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/two_client_themes_sync_test.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort headers, update copyrights Created 8 years, 6 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/test/integration/two_client_sessions_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4c487e02971bd5a80a603591727f22e34c32d1f6..d0e1cce30e35c60a4d43a27571f81b97154fd9b4 100644

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

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

@@ -1,11 +1,11 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

#include "base/basictypes.h"

#include "chrome/browser/sync/profile_sync_service_harness.h"

-#include "chrome/browser/sync/test/integration/themes_helper.h"

#include "chrome/browser/sync/test/integration/sync_test.h"

+#include "chrome/browser/sync/test/integration/themes_helper.h"

using themes_helper::GetCustomTheme;

using themes_helper::GetThemeID;

@@ -199,7 +199,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DisableThemes) {

ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));

ASSERT_FALSE(UsingCustomTheme(verifier()));

- ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::THEMES));

+ ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::THEMES));

UseCustomTheme(GetProfile(0), 0);

UseCustomTheme(verifier(), 0);

ASSERT_TRUE(AwaitQuiescence());

@@ -208,7 +208,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DisableThemes) {

ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));

ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));

- ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::THEMES));

+ ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::THEMES));

ASSERT_TRUE(AwaitQuiescence());

ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));