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

chrome/browser/sync/test/integration/sync_datatype_helper.cc

Index: chrome/browser/sync/test/integration/sync_datatype_helper.cc
diff --git a/chrome/browser/sync/test/live_sync/sync_datatype_helper.cc b/chrome/browser/sync/test/integration/sync_datatype_helper.cc
similarity index 63%
rename from chrome/browser/sync/test/live_sync/sync_datatype_helper.cc
rename to chrome/browser/sync/test/integration/sync_datatype_helper.cc
index 3e50ced422a8b4c4e95945a7899f2b98c46c1d42..7921e10c979290e21e6c388b5a1ded37864aacac 100644
--- a/chrome/browser/sync/test/live_sync/sync_datatype_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_datatype_helper.cc
@@ -2,26 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 namespace {
 
-// The LiveSyncTest instance associated with sync_datatype_helper.
-static LiveSyncTest* test = NULL;
+// The SyncTest instance associated with sync_datatype_helper.
+static SyncTest* test = NULL;
 
 }  // namespace
 
 namespace sync_datatype_helper {
 
-void AssociateWithTest(LiveSyncTest* test) {
+void AssociateWithTest(SyncTest* test) {
   ASSERT_TRUE(test != NULL) << "Cannot associate with null test.";
   ASSERT_TRUE(::test == NULL) << "Already associated with a test.";
   ::test = test;
 }
 
-LiveSyncTest* test() {
+SyncTest* test() {
   EXPECT_TRUE(::test != NULL) << "Must call AssociateWithTest first.";
   return ::test;
 }