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

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

Index: chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc
diff --git a/chrome/browser/sync/test/live_sync/performance/typed_urls_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc
similarity index 90%
rename from chrome/browser/sync/test/live_sync/performance/typed_urls_sync_perf_test.cc
rename to chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc
index 1aa85358637a738147d993e3d2dc85fab18c8869..2669a273fb9aecaab6984f9be8fb263e140a9644 100644
--- a/chrome/browser/sync/test/live_sync/performance/typed_urls_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc
@@ -4,9 +4,9 @@
 
 #include "base/stringprintf.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/performance/sync_timing_helper.h"
-#include "chrome/browser/sync/test/live_sync/typed_urls_helper.h"
+#include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/typed_urls_helper.h"
 
 using typed_urls_helper::AddUrlToHistory;
 using typed_urls_helper::AssertAllProfilesHaveSameURLsAsVerifier;
@@ -15,10 +15,10 @@ using typed_urls_helper::GetTypedUrlsFromClient;
 
 static const int kNumUrls = 150;
 
-class TypedUrlsSyncPerfTest : public LiveSyncTest {
+class TypedUrlsSyncPerfTest : public SyncTest {
  public:
   TypedUrlsSyncPerfTest()
-      : LiveSyncTest(TWO_CLIENT),
+      : SyncTest(TWO_CLIENT),
         url_number_(0) {}
 
   // Adds |num_urls| new unique typed urls to |profile|.