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

Unified Diff: chrome/browser/sync/test/integration/two_client_themes_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/integration/two_client_themes_sync_test.cc
diff --git a/chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
similarity index 97%
rename from chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc
rename to chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
index 2ca7c3fd434ee1e94318d0496d1f4b6e3db2c276..c1ecb51a487bc1423aaab3bf0bed00b995834f0f 100644
--- a/chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
@@ -4,8 +4,8 @@
#include "base/basictypes.h"
#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/themes_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/themes_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
using themes_helper::GetCustomTheme;
using themes_helper::GetThemeID;
@@ -18,9 +18,9 @@ using themes_helper::UsingCustomTheme;
using themes_helper::UsingDefaultTheme;
using themes_helper::UsingNativeTheme;
-class TwoClientThemesSyncTest : public LiveSyncTest {
+class TwoClientThemesSyncTest : public SyncTest {
public:
- TwoClientThemesSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+ TwoClientThemesSyncTest() : SyncTest(TWO_CLIENT) {}
virtual ~TwoClientThemesSyncTest() {}
private:

Powered by Google App Engine
This is Rietveld 408576698