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

chrome/browser/sync/test/integration/two_client_preferences_sync_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.
 
 #include "base/values.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/translate/translate_prefs.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/sync_test.h"
+#include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/common/pref_names.h"
 
 using preferences_helper::AppendStringPref;
 using preferences_helper::BooleanPrefMatches;
 using preferences_helper::ChangeBooleanPref;
 using preferences_helper::ChangeIntegerPref;
 using preferences_helper::ChangeListPref;
 using preferences_helper::ChangeStringPref;
 using preferences_helper::GetPrefs;
 using preferences_helper::IntegerPrefMatches;
 using preferences_helper::ListPrefMatches;
 using preferences_helper::StringPrefMatches;
 
-class TwoClientPreferencesSyncTest : public LiveSyncTest {
+class TwoClientPreferencesSyncTest : public SyncTest {
  public:
-  TwoClientPreferencesSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientPreferencesSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientPreferencesSyncTest);
 };
 
 // TCM ID - 7306186.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        kHomePageIsNewTabPage) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
@@ skipping 624 matching lines @@
   ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
   ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }