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

Unified Diff: chrome/browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc

Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 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
Index: chrome/browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc
diff --git a/chrome/browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc
deleted file mode 100644
index 9b87faef87c29ffeee123f774437b3d90c5a6d18..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/bookmarks_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-
-using bookmarks_helper::AddURL;
-using bookmarks_helper::AllModelsMatch;
-
-class ManyClientBookmarksSyncTest : public LiveSyncTest {
- public:
- ManyClientBookmarksSyncTest() : LiveSyncTest(MANY_CLIENT) {}
- virtual ~ManyClientBookmarksSyncTest() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ManyClientBookmarksSyncTest);
-};
-
-// TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
-IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, DISABLED_Sanity) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AddURL(0, L"Google URL", GURL("http://www.google.com/")) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients()));
- ASSERT_TRUE(AllModelsMatch());
-}

Powered by Google App Engine
This is Rietveld 408576698