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

Unified Diff: chrome/browser/sync/test/live_sync/sync_errors_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/sync_errors_test.cc
diff --git a/chrome/browser/sync/test/live_sync/sync_errors_test.cc b/chrome/browser/sync/test/live_sync/sync_errors_test.cc
deleted file mode 100644
index 835ece7253f9bd1b73946817381baa4d35209f01..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/test/live_sync/sync_errors_test.cc
+++ /dev/null
@@ -1,48 +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/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::AddFolder;
-using bookmarks_helper::SetTitle;
-
-class SyncErrorTest : public LiveSyncTest{
- public:
- SyncErrorTest() : LiveSyncTest(SINGLE_CLIENT) {}
- virtual ~SyncErrorTest() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SyncErrorTest);
-};
-
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
- SetTitle(0, node1, L"new_title1");
- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change."));
- TriggerBirthdayError();
-
- // Now make one more change so we will do another sync.
- const BookmarkNode* node2 = AddFolder(0, 0, L"title2");
- SetTitle(0, node2, L"new_title2");
- ASSERT_TRUE(GetClient(0)->AwaitSyncDisabled("Birthday error."));
-}
-
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, TransientErrorTest) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
- SetTitle(0, node1, L"new_title1");
- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change."));
- TriggerTransientError();
-
- // Now make one more change so we will do another sync.
- const BookmarkNode* node2 = AddFolder(0, 0, L"title2");
- SetTitle(0, node2, L"new_title2");
- ASSERT_TRUE(
- GetClient(0)->AwaitExponentialBackoffVerification());
-}
« no previous file with comments | « chrome/browser/sync/test/live_sync/sync_datatype_helper.cc ('k') | chrome/browser/sync/test/live_sync/sync_extension_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698