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

Unified Diff: chrome/browser/sync/test/integration/two_client_autofill_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_autofill_sync_test.cc
diff --git a/chrome/browser/sync/test/live_sync/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
similarity index 98%
rename from chrome/browser/sync/test/live_sync/two_client_autofill_sync_test.cc
rename to chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
index 1978a6165e3f134db1b62a59858c5ffc4f6ea33e..7c267416793c82ef60a63e97719cb4b2a3d9c48c 100644
--- a/chrome/browser/sync/test/live_sync/two_client_autofill_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
@@ -5,8 +5,8 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_profile.h"
#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/autofill_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/autofill_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/browser/webdata/autofill_entry.h"
using autofill_helper::AddKeys;
@@ -27,9 +27,9 @@ using autofill_helper::UpdateProfile;
// Autofill entry length is limited to 1024. See http://crbug.com/49332.
const size_t kMaxDataLength = 1024;
-class TwoClientAutofillSyncTest : public LiveSyncTest {
+class TwoClientAutofillSyncTest : public SyncTest {
public:
- TwoClientAutofillSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+ TwoClientAutofillSyncTest() : SyncTest(TWO_CLIENT) {}
virtual ~TwoClientAutofillSyncTest() {}
private:

Powered by Google App Engine
This is Rietveld 408576698