Rename browser/sync/test/live_sync directory to browser/sync/test/integration

chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc

Index: chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
diff --git a/chrome/browser/sync/test/live_sync/performance/passwords_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
similarity index 89%
rename from chrome/browser/sync/test/live_sync/performance/passwords_sync_perf_test.cc
rename to chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
index f5dda8732f24209af1afef8ad10123475875c4c0..82f3fd3ff09e1b86726858c82e6d2da161b5158d 100644
--- a/chrome/browser/sync/test/live_sync/performance/passwords_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
@@ -6,9 +6,9 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/passwords_helper.h"
-#include "chrome/browser/sync/test/live_sync/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/passwords_helper.h"
+#include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using passwords_helper::AddLogin;
 using passwords_helper::CreateTestPasswordForm;
@@ -19,9 +19,9 @@ using passwords_helper::UpdateLogin;
 
 static const int kNumPasswords = 150;
 
-class PasswordsSyncPerfTest : public LiveSyncTest {
+class PasswordsSyncPerfTest : public SyncTest {
  public:
-  PasswordsSyncPerfTest() : LiveSyncTest(TWO_CLIENT), password_number_(0) {}
+  PasswordsSyncPerfTest() : SyncTest(TWO_CLIENT), password_number_(0) {}
 
   // Adds |num_logins| new unique passwords to |profile|.
   void AddLogins(int profile, int num_logins);