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

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(akalin): Rename this file to migration_test.cc.
 
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/bookmarks_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/preferences_helper.h"
+#include "chrome/browser/sync/test/integration/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 using bookmarks_helper::AddURL;
 using bookmarks_helper::IndexedURL;
 using bookmarks_helper::IndexedURLTitle;
 
 using preferences_helper::BooleanPrefMatches;
 using preferences_helper::ChangeBooleanPref;
@@ skipping 38 matching lines @@
 
 MigrationList MakeList(syncable::ModelType type) {
   return MakeList(MakeSet(type));
 }
 
 MigrationList MakeList(syncable::ModelType type1,
                        syncable::ModelType type2) {
   return MakeList(MakeSet(type1), MakeSet(type2));
 }
 
-class MigrationTest : public LiveSyncTest {
+class MigrationTest : public SyncTest {
  public:
-  explicit MigrationTest(TestType test_type) : LiveSyncTest(test_type) {}
+  explicit MigrationTest(TestType test_type) : SyncTest(test_type) {}
   virtual ~MigrationTest() {}
 
   // TODO(akalin): Add more MODIFY_(data type) trigger methods, as
   // well as a poll-based trigger method.
   enum TriggerMethod { MODIFY_PREF, MODIFY_BOOKMARK, TRIGGER_NOTIFICATION };
 
   syncable::ModelTypeSet GetPreferredDataTypes() {
     syncable::ModelTypeSet preferred_data_types;
     GetClient(0)->service()->GetPreferredDataTypes(&preferred_data_types);
     // Make sure all clients have the same preferred data types.
@@ skipping 360 matching lines @@
 
   // Phase 5: Verify that preferences can still be synchronized.
   VerifyPrefSync();
 
   // Phase 6: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRegistered(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }
 
 }  // namespace