chrome/test/live_sync/single_client_live_extensions_sync_test.cc - Issue 6873061: [Sync] Revamp and re-enable themes/extensions sync integration tests

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/test/live_sync/single_client_live_extensions_sync_test.cc

Issue 6873061: [Sync] Revamp and re-enable themes/extensions sync integration tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync to head Created 9 years, 8 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/test/live_sync/live_themes_sync_test.cc ('k') | chrome/test/live_sync/single_client_live_themes_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/live_sync/single_client_live_extensions_sync_test.cc

diff --git a/chrome/test/live_sync/single_client_live_extensions_sync_test.cc b/chrome/test/live_sync/single_client_live_extensions_sync_test.cc

index 801ea6acbf4a7f6a1d20e909278acf2767786188..31926926354f2f241893abdca2aeeb23af12fc0e 100644

--- a/chrome/test/live_sync/single_client_live_extensions_sync_test.cc

+++ b/chrome/test/live_sync/single_client_live_extensions_sync_test.cc

@@ -3,9 +3,7 @@

// found in the LICENSE file.

#include "base/basictypes.h"

-#include "chrome/browser/profiles/profile.h"

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

-#include "chrome/common/extensions/extension.h"

#include "chrome/test/live_sync/live_extensions_sync_test.h"

class SingleClientLiveExtensionsSyncTest : public LiveExtensionsSyncTest {

@@ -26,15 +24,14 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest,

ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());

}

-// TODO(rsimha): Enable after http://crbug.com/70028 is fixed.

IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest,

- DISABLED_StartWithSomeExtensions) {

+ StartWithSomeExtensions) {

ASSERT_TRUE(SetupClients());

const int kNumExtensions = 5;

for (int i = 0; i < kNumExtensions; ++i) {

- InstallExtension(GetProfile(0), GetExtension(i));

- InstallExtension(verifier(), GetExtension(i));

+ InstallExtension(GetProfile(0), i);

+ InstallExtension(verifier(), i);

}

ASSERT_TRUE(SetupSync());

@@ -48,8 +45,8 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest,