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

chrome/browser/sync/test/integration/sync_test.h

Index: chrome/browser/sync/test/integration/sync_test.h
diff --git a/chrome/browser/sync/test/live_sync/live_sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
similarity index 96%
rename from chrome/browser/sync/test/live_sync/live_sync_test.h
rename to chrome/browser/sync/test/integration/sync_test.h
index 2769510c6c7ec2900b81c267ea0d66f4615812f0..3ee4f7ff50261e5e5a56c1df056b2638fc4f5a73 100644
--- a/chrome/browser/sync/test/live_sync/live_sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #pragma once
 
 #include "chrome/test/base/in_process_browser_test.h"
@@ -35,7 +35,7 @@ class URLRequestContextGetter;
 // This is the base class for integration tests for all sync data types. Derived
 // classes must be defined for each sync data type. Individual tests are defined
 // using the IN_PROC_BROWSER_TEST_F macro.
-class LiveSyncTest : public InProcessBrowserTest {
+class SyncTest : public InProcessBrowserTest {
  public:
   // The different types of live sync tests that can be implemented.
   enum TestType {
@@ -70,10 +70,10 @@ class LiveSyncTest : public InProcessBrowserTest {
                            // account state is initially clean.
   };
 
-  // A LiveSyncTest must be associated with a particular test type.
-  explicit LiveSyncTest(TestType test_type);
+  // A SyncTest must be associated with a particular test type.
+  explicit SyncTest(TestType test_type);
 
-  virtual ~LiveSyncTest();
+  virtual ~SyncTest();
 
   // Validates command line parameters and creates a local python test server if
   // specified.
@@ -309,9 +309,9 @@ class LiveSyncTest : public InProcessBrowserTest {
   // The URLFetcherFactory instance used to instantiate |fake_factory_|.
   scoped_ptr<URLFetcherFactory> factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(LiveSyncTest);
+  DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
-DISABLE_RUNNABLE_METHOD_REFCOUNT(LiveSyncTest);
+DISABLE_RUNNABLE_METHOD_REFCOUNT(SyncTest);
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_