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

http://codereview.chromium.org/7828055/ moved all sync test collateral
from chrome/tests to chrome/browser/sync/test.

This patch renames the browser/sync/test/live_sync directory to
browser/sync/test/integration, to differentiate the integration tests
from other test categories (like unit tests, sync engine tests, etc.)

It also renames the class LiveSyncTest to SyncTest, in keeping with the
name changes that went in with the recent sync integration test
framework refactor.

BUG=90905
TEST=sync_integration_tests

Review URL: http://codereview.chromium.org/7841007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99839 0039d316-1c4b-4281-b951-d872f2087c98

65 files changed, 382 insertions, 801 deletions

diff --git a/WATCHLISTS b/WATCHLISTS
index f8a1dc6..aefa5b3 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -102,8 +102,7 @@
       'filepath': 'sandbox/linux/.*',
     },
     'sync': {
-      'filepath': 'chrome/browser/sync/.*|chrome/browser/views/sync/.*|'\
-        'chrome/test/live_sync/.*',
+      'filepath': 'chrome/browser/sync/.*|chrome/browser/views/sync/.*',
     },
     'layout_tests': {
       'filepath': 'webkit/(tools|data)/(layout_tests|test_shell)/.*',
diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h
index a997f02..c2ba480 100644
--- a/chrome/browser/profiles/profile.h
+++ b/chrome/browser/profiles/profile.h
@@ -145,10 +145,10 @@ class Profile : public content::BrowserContext {
     friend class AutofillDownloadManager;
     friend class ChromePluginMessageFilter;
     friend class BrowserListTabContentsProvider;
-    friend class LiveSyncTest;
     friend class MetricsService;
     friend class SafeBrowsingServiceTestHelper;
     friend class SdchDictionaryFetcher;
+    friend class SyncTest;
     friend class Toolbar5Importer;
     friend class TranslateManager;
     friend class chrome::ChromeContentBrowserClient;
diff --git a/chrome/browser/sync/test/live_sync/apps_helper.cc b/chrome/browser/sync/test/integration/apps_helper.cc
index eb68002..43369d7 100644
--- a/chrome/browser/sync/test/live_sync/apps_helper.cc
+++ b/chrome/browser/sync/test/integration/apps_helper.cc
@@ -2,13 +2,13 @@
 // 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/apps_helper.h"
+#include "chrome/browser/sync/test/integration/apps_helper.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
-#include "chrome/browser/sync/test/live_sync/sync_extension_helper.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
 #include "chrome/common/extensions/extension.h"
 
 using sync_datatype_helper::test;
diff --git a/chrome/browser/sync/test/live_sync/apps_helper.h b/chrome/browser/sync/test/integration/apps_helper.h
index e1a1ca2..325d0d7 100644
--- a/chrome/browser/sync/test/live_sync/apps_helper.h
+++ b/chrome/browser/sync/test/integration/apps_helper.h
@@ -2,13 +2,13 @@
 // 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_APPS_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_APPS_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 class Profile;
 
@@ -45,4 +45,4 @@ void IncognitoDisableApp(Profile* profile, int index);
 
 }  // namespace apps_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_APPS_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc
index a1a96ee..4227e24 100644
--- a/chrome/browser/sync/test/live_sync/autofill_helper.cc
+++ b/chrome/browser/sync/test/integration/autofill_helper.cc
@@ -2,7 +2,7 @@
 // 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/autofill_helper.h"
+#include "chrome/browser/sync/test/integration/autofill_helper.h"
 
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
@@ -12,8 +12,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/web_database.h"
diff --git a/chrome/browser/sync/test/live_sync/autofill_helper.h b/chrome/browser/sync/test/integration/autofill_helper.h
index 50732f5..42ca239 100644
--- a/chrome/browser/sync/test/live_sync/autofill_helper.h
+++ b/chrome/browser/sync/test/integration/autofill_helper.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_AUTOFILL_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_AUTOFILL_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_AUTOFILL_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_AUTOFILL_HELPER_H_
 #pragma once
 
 #include <set>
@@ -12,7 +12,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 
 class AutofillEntry;
 class AutofillKey;
@@ -94,4 +94,4 @@ AutofillProfile CreateAutofillProfile(ProfileType type);
 
 }  // namespace autofill_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_AUTOFILL_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_AUTOFILL_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 18ed644..38edf82 100644
--- a/chrome/browser/sync/test/live_sync/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -2,7 +2,7 @@
 // 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/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
@@ -14,8 +14,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.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/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/sync/test/live_sync/bookmarks_helper.h b/chrome/browser/sync/test/integration/bookmarks_helper.h
index 8de894d..e506b28 100644
--- a/chrome/browser/sync/test/live_sync/bookmarks_helper.h
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.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_BOOKMARKS_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_BOOKMARKS_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
 #pragma once
 
 #include <set>
@@ -181,4 +181,4 @@ std::wstring IndexedSubsubfolderName(int i);
 
 }  // namespace bookmarks_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_BOOKMARKS_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/extensions_helper.cc b/chrome/browser/sync/test/integration/extensions_helper.cc
index 6bd9a20..6358e88 100644
--- a/chrome/browser/sync/test/live_sync/extensions_helper.cc
+++ b/chrome/browser/sync/test/integration/extensions_helper.cc
@@ -2,7 +2,7 @@
 // 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/extensions_helper.h"
+#include "chrome/browser/sync/test/integration/extensions_helper.h"
 
 #include <cstring>
 
@@ -10,8 +10,8 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
-#include "chrome/browser/sync/test/live_sync/sync_extension_helper.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
 #include "chrome/common/extensions/extension.h"
 
 using sync_datatype_helper::test;
diff --git a/chrome/browser/sync/test/live_sync/extensions_helper.h b/chrome/browser/sync/test/integration/extensions_helper.h
index 7103bca..25fe367 100644
--- a/chrome/browser/sync/test/live_sync/extensions_helper.h
+++ b/chrome/browser/sync/test/integration/extensions_helper.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_EXTENSIONS_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_EXTENSIONS_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_EXTENSIONS_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_EXTENSIONS_HELPER_H_
 #pragma once
 
 #include <string>
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 class Profile;
 
@@ -70,4 +70,4 @@ bool ExtensionNameToIndex(const std::string& name, int* index);
 
 }  // namespace extensions_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_EXTENSIONS_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_EXTENSIONS_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc
index 9b87fae..27c6fb3 100644
--- a/chrome/browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc
@@ -4,15 +4,15 @@
 
 #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/integration/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using bookmarks_helper::AddURL;
 using bookmarks_helper::AllModelsMatch;
 
-class ManyClientBookmarksSyncTest : public LiveSyncTest {
+class ManyClientBookmarksSyncTest : public SyncTest {
  public:
-  ManyClientBookmarksSyncTest() : LiveSyncTest(MANY_CLIENT) {}
+  ManyClientBookmarksSyncTest() : SyncTest(MANY_CLIENT) {}
   virtual ~ManyClientBookmarksSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/many_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc
index e701cc9..e5519bc 100644
--- a/chrome/browser/sync/test/live_sync/many_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc
@@ -5,8 +5,8 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_data.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/passwords_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/passwords_helper.h"
 
 using passwords_helper::AddLogin;
 using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier;
@@ -18,9 +18,9 @@ using passwords_helper::GetVerifierPasswordStore;
 
 using webkit_glue::PasswordForm;
 
-class ManyClientPasswordsSyncTest : public LiveSyncTest {
+class ManyClientPasswordsSyncTest : public SyncTest {
  public:
-  ManyClientPasswordsSyncTest() : LiveSyncTest(MANY_CLIENT) {}
+  ManyClientPasswordsSyncTest() : SyncTest(MANY_CLIENT) {}
   virtual ~ManyClientPasswordsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/many_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc
index a66b979..5301763 100644
--- a/chrome/browser/sync/test/live_sync/many_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc
@@ -3,16 +3,16 @@
 // found in the LICENSE file.
 
 #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/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::BooleanPrefMatches;
 using preferences_helper::ChangeBooleanPref;
 
-class ManyClientPreferencesSyncTest : public LiveSyncTest {
+class ManyClientPreferencesSyncTest : public SyncTest {
  public:
-  ManyClientPreferencesSyncTest() : LiveSyncTest(MANY_CLIENT) {}
+  ManyClientPreferencesSyncTest() : SyncTest(MANY_CLIENT) {}
   virtual ~ManyClientPreferencesSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc
index febefc8..868e573 100644
--- a/chrome/browser/sync/test/live_sync/migration_errors_test.cc
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
@@ -7,9 +7,9 @@
 #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"
@@ -68,9 +68,9 @@ MigrationList MakeList(syncable::ModelType type1,
   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
diff --git a/chrome/browser/sync/test/live_sync/multiple_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc
index cf70e6a..f51e8dc 100644
--- a/chrome/browser/sync/test/live_sync/multiple_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc
@@ -4,15 +4,15 @@
 
 #include "base/stringprintf.h"
 #include "chrome/browser/profiles/profile.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/integration/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using bookmarks_helper::AddURL;
 using bookmarks_helper::AllModelsMatch;
 
-class MultipleClientBookmarksSyncTest : public LiveSyncTest {
+class MultipleClientBookmarksSyncTest : public SyncTest {
  public:
-  MultipleClientBookmarksSyncTest() : LiveSyncTest(MULTIPLE_CLIENT) {}
+  MultipleClientBookmarksSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientBookmarksSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/multiple_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
index d722cc2..b1c8095 100644
--- a/chrome/browser/sync/test/live_sync/multiple_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
@@ -5,8 +5,8 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_data.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/passwords_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/passwords_helper.h"
 
 using passwords_helper::AddLogin;
 using passwords_helper::AllProfilesContainSamePasswordForms;
@@ -16,9 +16,9 @@ using passwords_helper::GetPasswordStore;
 
 using webkit_glue::PasswordForm;
 
-class MultipleClientPasswordsSyncTest : public LiveSyncTest {
+class MultipleClientPasswordsSyncTest : public SyncTest {
  public:
-  MultipleClientPasswordsSyncTest() : LiveSyncTest(MULTIPLE_CLIENT) {}
+  MultipleClientPasswordsSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientPasswordsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/multiple_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
index b2b32c6..b2c7d7a 100644
--- a/chrome/browser/sync/test/live_sync/multiple_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
@@ -4,16 +4,16 @@
 
 #include "base/stringprintf.h"
 #include "base/values.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::ChangeListPref;
 using preferences_helper::ListPrefMatches;
 
-class MultipleClientPreferencesSyncTest : public LiveSyncTest {
+class MultipleClientPreferencesSyncTest : public SyncTest {
  public:
-  MultipleClientPreferencesSyncTest() : LiveSyncTest(MULTIPLE_CLIENT) {}
+  MultipleClientPreferencesSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientPreferencesSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/multiple_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc
index e7236fa..584001f 100644
--- a/chrome/browser/sync/test/live_sync/multiple_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc
@@ -6,16 +6,16 @@
 #include "base/stringprintf.h"
 #include "chrome/browser/sessions/session_service.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/sessions_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/sessions_helper.h"
 
 using sessions_helper::CheckForeignSessionsAgainst;
 using sessions_helper::CheckInitialState;
 using sessions_helper::OpenTabAndGetLocalWindows;
 
-class MultipleClientSessionsSyncTest : public LiveSyncTest {
+class MultipleClientSessionsSyncTest : public SyncTest {
  public:
-  MultipleClientSessionsSyncTest() : LiveSyncTest(MULTIPLE_CLIENT) {}
+  MultipleClientSessionsSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientSessionsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/multiple_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc
index 01b0f7c..f030d21 100644
--- a/chrome/browser/sync/test/live_sync/multiple_client_typed_urls_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc
@@ -8,16 +8,16 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sessions/session_service.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/typed_urls_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;
 using typed_urls_helper::GetTypedUrlsFromClient;
 
-class MultipleClientTypedUrlsSyncTest : public LiveSyncTest {
+class MultipleClientTypedUrlsSyncTest : public SyncTest {
  public:
-  MultipleClientTypedUrlsSyncTest() : LiveSyncTest(MULTIPLE_CLIENT) {}
+  MultipleClientTypedUrlsSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientTypedUrlsSyncTest() {}
 
  private:
@@ -69,4 +69,3 @@ IN_PROC_BROWSER_TEST_F(MultipleClientTypedUrlsSyncTest, AddToAll) {
   // Verify that all clients have all urls.
   AssertAllProfilesHaveSameURLsAsVerifier();
 }
-
diff --git a/chrome/browser/sync/test/live_sync/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc
index 9484c39..4a10e2e 100644
--- a/chrome/browser/sync/test/live_sync/passwords_helper.cc
+++ b/chrome/browser/sync/test/integration/passwords_helper.cc
@@ -2,7 +2,7 @@
 // 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/passwords_helper.h"
+#include "chrome/browser/sync/test/integration/passwords_helper.h"
 
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ -11,7 +11,7 @@
 #include "chrome/browser/password_manager/password_store_consumer.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/browser_thread.h"
 
diff --git a/chrome/browser/sync/test/live_sync/passwords_helper.h b/chrome/browser/sync/test/integration/passwords_helper.h
index 783808c..197b7a0 100644
--- a/chrome/browser/sync/test/live_sync/passwords_helper.h
+++ b/chrome/browser/sync/test/integration/passwords_helper.h
@@ -2,15 +2,15 @@
 // 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_PASSWORDS_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_PASSWORDS_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_PASSWORDS_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PASSWORDS_HELPER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/time.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 #include "webkit/glue/password_form.h"
 
 class PasswordStore;
@@ -77,4 +77,4 @@ webkit_glue::PasswordForm CreateTestPasswordForm(int index);
 
 }  // namespace passwords_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_PASSWORDS_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_PASSWORDS_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/performance/autofill_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc
index 364019d..6deb9c7 100644
--- a/chrome/browser/sync/test/live_sync/performance/autofill_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc
@@ -7,9 +7,9 @@
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/autofill_helper.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/integration/autofill_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/webdata/autofill_entry.h"
 
 using autofill_helper::AllProfilesMatch;
@@ -23,10 +23,10 @@ using autofill_helper::SetProfiles;
 static const int kNumKeys = 150;
 static const int kNumProfiles = 150;
 
-class AutofillSyncPerfTest : public LiveSyncTest {
+class AutofillSyncPerfTest : public SyncTest {
  public:
   AutofillSyncPerfTest()
-      : LiveSyncTest(TWO_CLIENT),
+      : SyncTest(TWO_CLIENT),
         guid_number_(0),
         name_number_(0),
         value_number_(0) {}
diff --git a/chrome/browser/sync/test/live_sync/performance/bookmarks_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc
index 72103fa..a87f82e 100644
--- a/chrome/browser/sync/test/live_sync/performance/bookmarks_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #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/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using bookmarks_helper::AddURL;
 using bookmarks_helper::AllModelsMatch;
@@ -17,10 +17,10 @@ using bookmarks_helper::SetURL;
 
 static const int kNumBookmarks = 150;
 
-class BookmarksSyncPerfTest : public LiveSyncTest {
+class BookmarksSyncPerfTest : public SyncTest {
  public:
   BookmarksSyncPerfTest()
-      : LiveSyncTest(TWO_CLIENT),
+      : SyncTest(TWO_CLIENT),
         url_number_(0),
         url_title_number_(0) {}
 
diff --git a/chrome/browser/sync/test/live_sync/performance/extensions_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/extensions_sync_perf_test.cc
index dc88286..55720ab 100644
--- a/chrome/browser/sync/test/live_sync/performance/extensions_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/extensions_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/extensions_helper.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/integration/extensions_helper.h"
+#include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using extensions_helper::AllProfilesHaveSameExtensions;
 using extensions_helper::AllProfilesHaveSameExtensionsAsVerifier;
@@ -22,10 +22,10 @@ using extensions_helper::UninstallExtension;
 
 static const int kNumExtensions = 150;
 
-class ExtensionsSyncPerfTest : public LiveSyncTest {
+class ExtensionsSyncPerfTest : public SyncTest {
  public:
   ExtensionsSyncPerfTest()
-      : LiveSyncTest(TWO_CLIENT),
+      : SyncTest(TWO_CLIENT),
         extension_number_(0) {}
 
   // Adds |num_extensions| new unique extensions to |profile|.
diff --git a/chrome/browser/sync/test/live_sync/performance/passwords_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
index f5dda87..82f3fd3 100644
--- a/chrome/browser/sync/test/live_sync/performance/passwords_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
@@ -6,9 +6,9 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store.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/passwords_helper.h"
-#include "chrome/browser/sync/test/live_sync/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/passwords_helper.h"
+#include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using passwords_helper::AddLogin;
 using passwords_helper::CreateTestPasswordForm;
@@ -19,9 +19,9 @@ using passwords_helper::UpdateLogin;
 
 static const int kNumPasswords = 150;
 
-class PasswordsSyncPerfTest : public LiveSyncTest {
+class PasswordsSyncPerfTest : public SyncTest {
  public:
-  PasswordsSyncPerfTest() : LiveSyncTest(TWO_CLIENT), password_number_(0) {}
+  PasswordsSyncPerfTest() : SyncTest(TWO_CLIENT), password_number_(0) {}
 
   // Adds |num_logins| new unique passwords to |profile|.
   void AddLogins(int profile, int num_logins);
diff --git a/chrome/browser/sync/test/live_sync/performance/sessions_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc
index 3bb5d45..93462a4 100644
--- a/chrome/browser/sync/test/live_sync/performance/sessions_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc
@@ -5,9 +5,9 @@
 #include "base/stringprintf.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/performance/sync_timing_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/sessions_helper.h"
+#include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/sessions_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using sessions_helper::GetLocalSession;
 using sessions_helper::GetSessionData;
@@ -16,9 +16,9 @@ using sessions_helper::WaitForTabsToLoad;
 
 static const int kNumTabs = 150;
 
-class SessionsSyncPerfTest: public LiveSyncTest {
+class SessionsSyncPerfTest: public SyncTest {
  public:
-  SessionsSyncPerfTest() : LiveSyncTest(TWO_CLIENT), url_number_(0) {}
+  SessionsSyncPerfTest() : SyncTest(TWO_CLIENT), url_number_(0) {}
 
   // Opens |num_tabs| new tabs on |profile|.
   void AddTabs(int profile, int num_tabs);
diff --git a/chrome/browser/sync/test/live_sync/performance/sync_timing_helper.cc b/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc
index 8d985f6..a0434c0 100644
--- a/chrome/browser/sync/test/live_sync/performance/sync_timing_helper.cc
+++ b/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc
@@ -2,7 +2,7 @@
 // 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/performance/sync_timing_helper.h"
+#include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
 
 #include "base/string_number_conversions.h"
 #include "base/time.h"
diff --git a/chrome/browser/sync/test/live_sync/performance/sync_timing_helper.h b/chrome/browser/sync/test/integration/performance/sync_timing_helper.h
index 8d87aeb..b373fa4 100644
--- a/chrome/browser/sync/test/live_sync/performance/sync_timing_helper.h
+++ b/chrome/browser/sync/test/integration/performance/sync_timing_helper.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_PERFORMANCE_SYNC_TIMING_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_PERFORMANCE_SYNC_TIMING_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_PERFORMANCE_SYNC_TIMING_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PERFORMANCE_SYNC_TIMING_HELPER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -46,4 +46,4 @@ class SyncTimingHelper {
   DISALLOW_COPY_AND_ASSIGN(SyncTimingHelper);
 };
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_PERFORMANCE_SYNC_TIMING_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_PERFORMANCE_SYNC_TIMING_HELPER_H_
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
index 1aa8535..2669a27 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|.
diff --git a/chrome/browser/sync/test/live_sync/preferences_helper.cc b/chrome/browser/sync/test/integration/preferences_helper.cc
index 89d59d5..9d33b89 100644
--- a/chrome/browser/sync/test/live_sync/preferences_helper.cc
+++ b/chrome/browser/sync/test/integration/preferences_helper.cc
@@ -2,15 +2,15 @@
 // 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/preferences_helper.h"
+#include "chrome/browser/sync/test/integration/preferences_helper.h"
 
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #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/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 
 using sync_datatype_helper::test;
 
diff --git a/chrome/browser/sync/test/live_sync/preferences_helper.h b/chrome/browser/sync/test/integration/preferences_helper.h
index 6fa4ce0..0d6d958 100644
--- a/chrome/browser/sync/test/live_sync/preferences_helper.h
+++ b/chrome/browser/sync/test/integration/preferences_helper.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_PREFERENCES_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_PREFERENCES_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_
 #pragma once
 
 #include "base/file_path.h"
@@ -97,4 +97,4 @@ bool ListPrefMatches(const char* pref_name) WARN_UNUSED_RESULT;
 
 }  // namespace preferences_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_PREFERENCES_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc
index bf73670..104629a 100644
--- a/chrome/browser/sync/test/live_sync/sessions_helper.cc
+++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -2,7 +2,7 @@
 // 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/sessions_helper.h"
+#include "chrome/browser/sync/test/integration/sessions_helper.h"
 
 #include "base/stl_util.h"
 #include "base/test/test_timeouts.h"
@@ -11,8 +11,8 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/browser_thread.h"
diff --git a/chrome/browser/sync/test/live_sync/sessions_helper.h b/chrome/browser/sync/test/integration/sessions_helper.h
index 3c56ea1..22c8831 100644
--- a/chrome/browser/sync/test/live_sync/sessions_helper.h
+++ b/chrome/browser/sync/test/integration/sessions_helper.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_SESSIONS_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_SESSIONS_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_
 #pragma once
 
 #include <algorithm>
@@ -13,7 +13,7 @@
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sync/glue/synced_session.h"
 #include "chrome/browser/sync/engine/nigori_util.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 class GURL;
 
@@ -108,4 +108,4 @@ bool GetLocalSession(int index, const browser_sync::SyncedSession** session);
 
 }  // namespace sessions_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_SESSIONS_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/single_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc
index 25b024a..1840e45 100644
--- a/chrome/browser/sync/test/live_sync/single_client_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc
@@ -4,15 +4,15 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/apps_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/apps_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::InstallApp;
 
-class SingleClientAppsSyncTest : public LiveSyncTest {
+class SingleClientAppsSyncTest : public SyncTest {
  public:
-  SingleClientAppsSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SingleClientAppsSyncTest() : SyncTest(SINGLE_CLIENT) {}
 
   virtual ~SingleClientAppsSyncTest() {}
 
diff --git a/chrome/browser/sync/test/live_sync/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
index c4bb875..4ca31ad 100644
--- a/chrome/browser/sync/test/live_sync/single_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
@@ -4,8 +4,8 @@
 
 #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/integration/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using bookmarks_helper::AddFolder;
 using bookmarks_helper::AddURL;
@@ -16,9 +16,9 @@ using bookmarks_helper::Move;
 using bookmarks_helper::Remove;
 using bookmarks_helper::SetTitle;
 
-class SingleClientBookmarksSyncTest : public LiveSyncTest {
+class SingleClientBookmarksSyncTest : public SyncTest {
  public:
-  SingleClientBookmarksSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SingleClientBookmarksSyncTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SingleClientBookmarksSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/single_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc
index 7155826..3876136 100644
--- a/chrome/browser/sync/test/live_sync/single_client_extensions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc
@@ -4,15 +4,15 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/extensions_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/extensions_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using extensions_helper::AllProfilesHaveSameExtensionsAsVerifier;
 using extensions_helper::InstallExtension;
 
-class SingleClientExtensionsSyncTest : public LiveSyncTest {
+class SingleClientExtensionsSyncTest : public SyncTest {
  public:
-  SingleClientExtensionsSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SingleClientExtensionsSyncTest() : SyncTest(SINGLE_CLIENT) {}
 
   virtual ~SingleClientExtensionsSyncTest() {}
 
diff --git a/chrome/browser/sync/test/live_sync/single_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc
index 3d81f50..615fddc3 100644
--- a/chrome/browser/sync/test/live_sync/single_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/password_manager/password_form_data.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/passwords_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/passwords_helper.h"
 
 using passwords_helper::AddLogin;
 using passwords_helper::CreateTestPasswordForm;
@@ -17,9 +17,9 @@ using passwords_helper::ProfileContainsSamePasswordFormsAsVerifier;
 
 using webkit_glue::PasswordForm;
 
-class SingleClientPasswordsSyncTest : public LiveSyncTest {
+class SingleClientPasswordsSyncTest : public SyncTest {
  public:
-  SingleClientPasswordsSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SingleClientPasswordsSyncTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SingleClientPasswordsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/single_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc
index cb96004..bf319d0 100644
--- a/chrome/browser/sync/test/live_sync/single_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc
@@ -4,15 +4,15 @@
 
 #include "chrome/common/pref_names.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/preferences_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/preferences_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using preferences_helper::BooleanPrefMatches;
 using preferences_helper::ChangeBooleanPref;
 
-class SingleClientPreferencesSyncTest : public LiveSyncTest {
+class SingleClientPreferencesSyncTest : public SyncTest {
  public:
-  SingleClientPreferencesSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SingleClientPreferencesSyncTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SingleClientPreferencesSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/single_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
index 382c983..2aa14e9 100644
--- a/chrome/browser/sync/test/live_sync/single_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
@@ -5,8 +5,8 @@
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/sessions/session_service.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/sessions_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/sessions_helper.h"
 
 using sessions_helper::CheckInitialState;
 using sessions_helper::GetLocalWindows;
@@ -14,9 +14,9 @@ using sessions_helper::GetSessionData;
 using sessions_helper::OpenTabAndGetLocalWindows;
 using sessions_helper::WindowsMatch;
 
-class SingleClientSessionsSyncTest : public LiveSyncTest {
+class SingleClientSessionsSyncTest : public SyncTest {
  public:
-  SingleClientSessionsSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SingleClientSessionsSyncTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SingleClientSessionsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/single_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc
index ce5f431..3257b2d 100644
--- a/chrome/browser/sync/test/live_sync/single_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc
@@ -4,8 +4,8 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/themes_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/themes_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using themes_helper::GetCustomTheme;
 using themes_helper::GetThemeID;
@@ -16,9 +16,9 @@ using themes_helper::UsingCustomTheme;
 using themes_helper::UsingDefaultTheme;
 using themes_helper::UsingNativeTheme;
 
-class SingleClientThemesSyncTest : public LiveSyncTest {
+class SingleClientThemesSyncTest : public SyncTest {
  public:
-  SingleClientThemesSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SingleClientThemesSyncTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SingleClientThemesSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/single_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc
index 064d02d..5833138 100644
--- a/chrome/browser/sync/test/live_sync/single_client_typed_urls_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc
@@ -6,8 +6,8 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sessions/session_service.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/typed_urls_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,9 +15,9 @@ using typed_urls_helper::GetTypedUrlsFromClient;
 
 const std::string kSanityHistoryUrl = "http://www.sanity-history.google.com";
 
-class SingleClientTypedUrlsSyncTest : public LiveSyncTest {
+class SingleClientTypedUrlsSyncTest : public SyncTest {
  public:
-  SingleClientTypedUrlsSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SingleClientTypedUrlsSyncTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SingleClientTypedUrlsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/sync_datatype_helper.cc b/chrome/browser/sync/test/integration/sync_datatype_helper.cc
index 3e50ced..7921e10 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;
 }
diff --git a/chrome/browser/sync/test/integration/sync_datatype_helper.h b/chrome/browser/sync/test/integration/sync_datatype_helper.h
new file mode 100644
index 0000000..70cd0ad
--- /dev/null
+++ b/chrome/browser/sync/test/integration/sync_datatype_helper.h
@@ -0,0 +1,26 @@
+// 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.
+
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_DATATYPE_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_DATATYPE_HELPER_H_
+#pragma once
+
+#include "base/basictypes.h"
+
+class SyncTest;
+
+namespace sync_datatype_helper {
+
+// Associates an instance of SyncTest with sync_datatype_helper. Must be
+// called before any of the methods in the per-datatype helper namespaces can be
+// used.
+void AssociateWithTest(SyncTest* test);
+
+// Returns a pointer to the instance of SyncTest associated with the
+// per-datatype helpers after making sure it is valid.
+SyncTest* test();
+
+}  // namespace sync_datatype_helper
+
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_DATATYPE_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
index 835ece7..95c28cf 100644
--- a/chrome/browser/sync/test/live_sync/sync_errors_test.cc
+++ b/chrome/browser/sync/test/integration/sync_errors_test.cc
@@ -3,15 +3,15 @@
 // found in the LICENSE file.
 
 #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/integration/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using bookmarks_helper::AddFolder;
 using bookmarks_helper::SetTitle;
 
-class SyncErrorTest : public LiveSyncTest{
+class SyncErrorTest : public SyncTest{
  public:
-  SyncErrorTest() : LiveSyncTest(SINGLE_CLIENT) {}
+  SyncErrorTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SyncErrorTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index e5de2e4..a738ad9 100644
--- a/chrome/browser/sync/test/live_sync/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -2,7 +2,7 @@
 // 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_extension_helper.h"
+#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -13,8 +13,8 @@
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 SyncExtensionHelper::ExtensionState::ExtensionState()
@@ -46,7 +46,7 @@ std::string SyncExtensionHelper::NameToId(const std::string& name) {
   return id;
 }
 
-void SyncExtensionHelper::SetupIfNecessary(LiveSyncTest* test) {
+void SyncExtensionHelper::SetupIfNecessary(SyncTest* test) {
   if (setup_completed_)
     return;
 
diff --git a/chrome/browser/sync/test/live_sync/sync_extension_helper.h b/chrome/browser/sync/test/integration/sync_extension_helper.h
index 4aa3f1d..7968556 100644
--- a/chrome/browser/sync/test/live_sync/sync_extension_helper.h
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.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_SYNC_EXTENSION_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_SYNC_EXTENSION_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
 #pragma once
 
 #include <map>
@@ -17,8 +17,8 @@
 #include "chrome/common/extensions/extension.h"
 
 class Extension;
-class LiveSyncTest;
 class Profile;
+class SyncTest;
 
 class SyncExtensionHelper {
  public:
@@ -30,7 +30,7 @@ class SyncExtensionHelper {
 
   // Initializes the profiles in |test| and registers them with
   // internal data structures.
-  void SetupIfNecessary(LiveSyncTest* test);
+  void SetupIfNecessary(SyncTest* test);
 
   // Installs the extension with the given name to |profile|.
   void InstallExtension(
@@ -117,4 +117,4 @@ class SyncExtensionHelper {
   DISALLOW_COPY_AND_ASSIGN(SyncExtensionHelper);
 };
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_SYNC_EXTENSION_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/live_sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index d47f34e..aa0ebbd 100644
--- a/chrome/browser/sync/test/live_sync/live_sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -2,7 +2,7 @@
 // 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/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <vector>
 
@@ -23,7 +23,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/notifier/p2p_notifier.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_paths.h"
@@ -108,7 +108,7 @@ class SetProxyConfigTask : public Task {
   net::ProxyConfig proxy_config_;
 };
 
-LiveSyncTest::LiveSyncTest(TestType test_type)
+SyncTest::SyncTest(TestType test_type)
     : sync_server_(net::TestServer::TYPE_SYNC, FilePath()),
       test_type_(test_type),
       server_type_(SERVER_TYPE_UNDECIDED),
@@ -137,9 +137,9 @@ LiveSyncTest::LiveSyncTest(TestType test_type)
   }
 }
 
-LiveSyncTest::~LiveSyncTest() {}
+SyncTest::~SyncTest() {}
 
-void LiveSyncTest::SetUp() {
+void SyncTest::SetUp() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kPasswordFileForTest)) {
     ReadPasswordFile();
@@ -153,13 +153,13 @@ void LiveSyncTest::SetUp() {
 
   if (!cl->HasSwitch(switches::kSyncServiceURL) &&
       !cl->HasSwitch(switches::kSyncServerCommandLine)) {
-   // If neither a sync server URL nor a sync server command line is
-   // provided, start up a local python sync test server and point Chrome
-   // to its URL.  This is the most common configuration, and the only
-   // one that makes sense for most developers.
-   server_type_ = LOCAL_PYTHON_SERVER;
+    // If neither a sync server URL nor a sync server command line is
+    // provided, start up a local python sync test server and point Chrome
+    // to its URL.  This is the most common configuration, and the only
+    // one that makes sense for most developers.
+    server_type_ = LOCAL_PYTHON_SERVER;
   } else if (cl->HasSwitch(switches::kSyncServiceURL) &&
-              cl->HasSwitch(switches::kSyncServerCommandLine)) {
+             cl->HasSwitch(switches::kSyncServerCommandLine)) {
     // If a sync server URL and a sync server command line are provided,
     // start up a local sync server by running the command line. Chrome
     // will connect to the server at the URL that was provided.
@@ -189,7 +189,7 @@ void LiveSyncTest::SetUp() {
   InProcessBrowserTest::SetUp();
 }
 
-void LiveSyncTest::TearDown() {
+void SyncTest::TearDown() {
   // Allow the InProcessBrowserTest framework to perform its tear down.
   InProcessBrowserTest::TearDown();
 
@@ -200,12 +200,12 @@ void LiveSyncTest::TearDown() {
   TearDownLocalTestServer();
 }
 
-void LiveSyncTest::SetUpCommandLine(CommandLine* cl) {
+void SyncTest::SetUpCommandLine(CommandLine* cl) {
   AddTestSwitches(cl);
   AddOptionalTypesToCommandLine(cl);
 }
 
-void LiveSyncTest::AddTestSwitches(CommandLine* cl) {
+void SyncTest::AddTestSwitches(CommandLine* cl) {
   // TODO(rsimha): Until we implement a fake Tango server against which tests
   // can run, we need to set the --sync-notification-method to "p2p".
   if (!cl->HasSwitch(switches::kSyncNotificationMethod))
@@ -216,14 +216,14 @@ void LiveSyncTest::AddTestSwitches(CommandLine* cl) {
     cl->AppendSwitch(switches::kDisableBackgroundNetworking);
 }
 
-void LiveSyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {
+void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {
   // TODO(sync): Remove this once sessions sync is enabled by default.
   if (!cl->HasSwitch(switches::kEnableSyncSessions))
     cl->AppendSwitch(switches::kEnableSyncSessions);
 }
 
 // static
-Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) {
+Profile* SyncTest::MakeProfile(const FilePath::StringType name) {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.Append(name);
@@ -234,7 +234,7 @@ Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) {
   return Profile::CreateProfile(path);
 }
 
-Profile* LiveSyncTest::GetProfile(int index) {
+Profile* SyncTest::GetProfile(int index) {
   if (profiles_.empty())
     LOG(FATAL) << "SetupClients() has not yet been called.";
   if (index < 0 || index >= static_cast<int>(profiles_.size()))
@@ -242,7 +242,7 @@ Profile* LiveSyncTest::GetProfile(int index) {
   return profiles_[index];
 }
 
-Browser* LiveSyncTest::GetBrowser(int index) {
+Browser* SyncTest::GetBrowser(int index) {
   if (browsers_.empty())
     LOG(FATAL) << "SetupClients() has not yet been called.";
   if (index < 0 || index >= static_cast<int>(browsers_.size()))
@@ -250,7 +250,7 @@ Browser* LiveSyncTest::GetBrowser(int index) {
   return browsers_[index];
 }
 
-ProfileSyncServiceHarness* LiveSyncTest::GetClient(int index) {
+ProfileSyncServiceHarness* SyncTest::GetClient(int index) {
   if (clients_.empty())
     LOG(FATAL) << "SetupClients() has not yet been called.";
   if (index < 0 || index >= static_cast<int>(clients_.size()))
@@ -258,17 +258,17 @@ ProfileSyncServiceHarness* LiveSyncTest::GetClient(int index) {
   return clients_[index];
 }
 
-Profile* LiveSyncTest::verifier() {
+Profile* SyncTest::verifier() {
   if (verifier_.get() == NULL)
     LOG(FATAL) << "SetupClients() has not yet been called.";
   return verifier_.get();
 }
 
-void LiveSyncTest::DisableVerifier() {
+void SyncTest::DisableVerifier() {
   use_verifier_ = false;
 }
 
-bool LiveSyncTest::SetupClients() {
+bool SyncTest::SetupClients() {
   if (num_clients_ <= 0)
     LOG(FATAL) << "num_clients_ incorrectly initialized.";
   if (!profiles_.empty() || !browsers_.empty() || !clients_.empty())
@@ -300,7 +300,7 @@ bool LiveSyncTest::SetupClients() {
   return (verifier_.get() != NULL);
 }
 
-bool LiveSyncTest::SetupSync() {
+bool SyncTest::SetupSync() {
   // Create sync profiles and clients if they haven't already been created.
   if (profiles_.empty()) {
     if (!SetupClients())
@@ -316,7 +316,7 @@ bool LiveSyncTest::SetupSync() {
   return true;
 }
 
-void LiveSyncTest::CleanUpOnMainThread() {
+void SyncTest::CleanUpOnMainThread() {
   // Close all browser windows.
   BrowserList::CloseAllBrowsers();
   ui_test_utils::RunAllPendingInMessageLoop();
@@ -330,7 +330,7 @@ void LiveSyncTest::CleanUpOnMainThread() {
   verifier_.reset(NULL);
 }
 
-void LiveSyncTest::SetUpInProcessBrowserTestFixture() {
+void SyncTest::SetUpInProcessBrowserTestFixture() {
   // We don't take a reference to |resolver|, but mock_host_resolver_override_
   // does, so effectively assumes ownership.
   net::RuleBasedHostResolverProc* resolver =
@@ -346,11 +346,11 @@ void LiveSyncTest::SetUpInProcessBrowserTestFixture() {
       new net::ScopedDefaultHostResolverProc(resolver));
 }
 
-void LiveSyncTest::TearDownInProcessBrowserTestFixture() {
+void SyncTest::TearDownInProcessBrowserTestFixture() {
   mock_host_resolver_override_.reset();
 }
 
-void LiveSyncTest::ReadPasswordFile() {
+void SyncTest::ReadPasswordFile() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   password_file_ = cl->GetSwitchValuePath(switches::kPasswordFileForTest);
   if (password_file_.empty())
@@ -370,7 +370,7 @@ void LiveSyncTest::ReadPasswordFile() {
   password_ = tokens[1];
 }
 
-void LiveSyncTest::SetupMockGaiaResponses() {
+void SyncTest::SetupMockGaiaResponses() {
   username_ = "user@gmail.com";
   password_ = "password";
   factory_.reset(new URLFetcherFactory());
@@ -383,7 +383,7 @@ void LiveSyncTest::SetupMockGaiaResponses() {
 
 // Start up a local sync server based on the value of server_type_, which
 // was determined from the command line parameters.
-void LiveSyncTest::SetUpTestServerIfRequired() {
+void SyncTest::SetUpTestServerIfRequired() {
   if (server_type_ == LOCAL_PYTHON_SERVER) {
     if (!SetUpLocalPythonTestServer())
       LOG(FATAL) << "Failed to set up local python sync and XMPP servers";
@@ -400,7 +400,7 @@ void LiveSyncTest::SetUpTestServerIfRequired() {
   }
 }
 
-bool LiveSyncTest::SetUpLocalPythonTestServer() {
+bool SyncTest::SetUpLocalPythonTestServer() {
   EXPECT_TRUE(sync_server_.Start())
       << "Could not launch local python test server.";
 
@@ -437,7 +437,7 @@ bool LiveSyncTest::SetUpLocalPythonTestServer() {
   return true;
 }
 
-bool LiveSyncTest::SetUpLocalTestServer() {
+bool SyncTest::SetUpLocalTestServer() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   CommandLine::StringType server_cmdline_string = cl->GetSwitchValueNative(
       switches::kSyncServerCommandLine);
@@ -465,7 +465,7 @@ bool LiveSyncTest::SetUpLocalTestServer() {
   }
 }
 
-bool LiveSyncTest::TearDownLocalPythonTestServer() {
+bool SyncTest::TearDownLocalPythonTestServer() {
   if (!sync_server_.Stop()) {
     LOG(ERROR) << "Could not stop local python test server.";
     return false;
@@ -474,7 +474,7 @@ bool LiveSyncTest::TearDownLocalPythonTestServer() {
   return true;
 }
 
-bool LiveSyncTest::TearDownLocalTestServer() {
+bool SyncTest::TearDownLocalTestServer() {
   if (test_server_handle_ != base::kNullProcessHandle) {
     EXPECT_TRUE(base::KillProcess(test_server_handle_, 0, false))
         << "Could not stop local test server.";
@@ -484,7 +484,7 @@ bool LiveSyncTest::TearDownLocalTestServer() {
   return true;
 }
 
-bool LiveSyncTest::WaitForTestServerToStart(int time_ms, int intervals) {
+bool SyncTest::WaitForTestServerToStart(int time_ms, int intervals) {
   for (int i = 0; i < intervals; ++i) {
     if (IsTestServerRunning())
       return true;
@@ -493,7 +493,7 @@ bool LiveSyncTest::WaitForTestServerToStart(int time_ms, int intervals) {
   return false;
 }
 
-bool LiveSyncTest::IsTestServerRunning() {
+bool SyncTest::IsTestServerRunning() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   std::string sync_url = cl->GetSwitchValueASCII(switches::kSyncServiceURL);
   GURL sync_url_status(sync_url.append("/healthz"));
@@ -505,14 +505,14 @@ bool LiveSyncTest::IsTestServerRunning() {
   return delegate.running();
 }
 
-void LiveSyncTest::EnableNetwork(Profile* profile) {
+void SyncTest::EnableNetwork(Profile* profile) {
   SetProxyConfig(profile->GetRequestContext(),
                  net::ProxyConfig::CreateDirect());
   // TODO(rsimha): Remove this line once http://crbug.com/53857 is fixed.
   net::NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
 }
 
-void LiveSyncTest::DisableNetwork(Profile* profile) {
+void SyncTest::DisableNetwork(Profile* profile) {
   // Set the current proxy configuration to a nonexistent proxy to effectively
   // disable networking.
   net::ProxyConfig config;
@@ -522,26 +522,26 @@ void LiveSyncTest::DisableNetwork(Profile* profile) {
   net::NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
 }
 
-bool LiveSyncTest::EnableEncryption(int index, syncable::ModelType type) {
+bool SyncTest::EnableEncryption(int index, syncable::ModelType type) {
   return GetClient(index)->EnableEncryptionForType(type);
 }
 
-bool LiveSyncTest::IsEncrypted(int index, syncable::ModelType type) {
+bool SyncTest::IsEncrypted(int index, syncable::ModelType type) {
   return GetClient(index)->IsTypeEncrypted(type);
 }
 
-bool LiveSyncTest::AwaitQuiescence() {
+bool SyncTest::AwaitQuiescence() {
   return ProfileSyncServiceHarness::AwaitQuiescence(clients());
 }
 
-bool LiveSyncTest::ServerSupportsNotificationControl() const {
+bool SyncTest::ServerSupportsNotificationControl() const {
   EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
 
   // Supported only if we're using the python testserver.
   return server_type_ == LOCAL_PYTHON_SERVER;
 }
 
-void LiveSyncTest::DisableNotifications() {
+void SyncTest::DisableNotifications() {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   std::string path = "chromiumsync/disablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
@@ -549,7 +549,7 @@ void LiveSyncTest::DisableNotifications() {
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
-void LiveSyncTest::EnableNotifications() {
+void SyncTest::EnableNotifications() {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   std::string path = "chromiumsync/enablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
@@ -557,7 +557,7 @@ void LiveSyncTest::EnableNotifications() {
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
-void LiveSyncTest::TriggerNotification(
+void SyncTest::TriggerNotification(
     const syncable::ModelTypeSet& changed_types) {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   const std::string& data =
@@ -572,14 +572,14 @@ void LiveSyncTest::TriggerNotification(
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
-bool LiveSyncTest::ServerSupportsErrorTriggering() const {
+bool SyncTest::ServerSupportsErrorTriggering() const {
   EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
 
   // Supported only if we're using the python testserver.
   return server_type_ == LOCAL_PYTHON_SERVER;
 }
 
-void LiveSyncTest::TriggerMigrationDoneError(
+void SyncTest::TriggerMigrationDoneError(
     const syncable::ModelTypeSet& model_types) {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/migrate";
@@ -595,7 +595,7 @@ void LiveSyncTest::TriggerMigrationDoneError(
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
-void LiveSyncTest::TriggerBirthdayError() {
+void SyncTest::TriggerBirthdayError() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/birthdayerror";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
@@ -603,7 +603,7 @@ void LiveSyncTest::TriggerBirthdayError() {
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
-void LiveSyncTest::TriggerTransientError() {
+void SyncTest::TriggerTransientError() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/transienterror";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
@@ -611,7 +611,7 @@ void LiveSyncTest::TriggerTransientError() {
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
-void LiveSyncTest::TriggerSetSyncTabs() {
+void SyncTest::TriggerSetSyncTabs() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/synctabs";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
@@ -619,8 +619,8 @@ void LiveSyncTest::TriggerSetSyncTabs() {
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
-void LiveSyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
-                                  const net::ProxyConfig& proxy_config) {
+void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
+                              const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO,
diff --git a/chrome/browser/sync/test/live_sync/live_sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index 2769510c..3ee4f7f 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_
diff --git a/chrome/browser/sync/test/live_sync/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc
index 8956340..d2d9edd 100644
--- a/chrome/browser/sync/test/live_sync/themes_helper.cc
+++ b/chrome/browser/sync/test/integration/themes_helper.cc
@@ -2,15 +2,15 @@
 // 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/themes_helper.h"
+#include "chrome/browser/sync/test/integration/themes_helper.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
-#include "chrome/browser/sync/test/live_sync/sync_extension_helper.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
 
 using sync_datatype_helper::test;
 
diff --git a/chrome/browser/sync/test/live_sync/themes_helper.h b/chrome/browser/sync/test/integration/themes_helper.h
index 6e28d1a..025b2ab 100644
--- a/chrome/browser/sync/test/live_sync/themes_helper.h
+++ b/chrome/browser/sync/test/integration/themes_helper.h
@@ -2,15 +2,15 @@
 // 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_THEMES_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_THEMES_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_THEMES_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_THEMES_HELPER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 class Profile;
 
@@ -52,4 +52,4 @@ void UseNativeTheme(Profile* profile);
 
 }  // namespace themes_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_THEMES_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_THEMES_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
index d6c48ea..35322ad 100644
--- a/chrome/browser/sync/test/live_sync/two_client_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
@@ -4,8 +4,8 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/apps_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/apps_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::DisableApp;
@@ -17,9 +17,9 @@ using apps_helper::InstallApp;
 using apps_helper::InstallAppsPendingForSync;
 using apps_helper::UninstallApp;
 
-class TwoClientAppsSyncTest : public LiveSyncTest {
+class TwoClientAppsSyncTest : public SyncTest {
  public:
-  TwoClientAppsSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientAppsSyncTest() : SyncTest(TWO_CLIENT) {}
 
   virtual ~TwoClientAppsSyncTest() {}
 
diff --git a/chrome/browser/sync/test/live_sync/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
index 1978a61..7c26741 100644
--- a/chrome/browser/sync/test/live_sync/two_client_autofill_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
@@ -5,8 +5,8 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/autofill_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/autofill_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 
 using autofill_helper::AddKeys;
@@ -27,9 +27,9 @@ using autofill_helper::UpdateProfile;
 // Autofill entry length is limited to 1024.  See http://crbug.com/49332.
 const size_t kMaxDataLength = 1024;
 
-class TwoClientAutofillSyncTest : public LiveSyncTest {
+class TwoClientAutofillSyncTest : public SyncTest {
  public:
-  TwoClientAutofillSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientAutofillSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientAutofillSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
index 869be0e..de69bc9 100644
--- a/chrome/browser/sync/test/live_sync/two_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
@@ -5,8 +5,8 @@
 #include "base/rand_util.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/integration/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using bookmarks_helper::AddFolder;
 using bookmarks_helper::AddURL;
@@ -37,9 +37,9 @@ const std::wstring kGenericFolderName = L"Folder Name";
 const std::wstring kGenericSubfolderName = L"Subfolder Name";
 const std::wstring kGenericSubsubfolderName = L"Subsubfolder Name";
 
-class TwoClientBookmarksSyncTest : public LiveSyncTest {
+class TwoClientBookmarksSyncTest : public SyncTest {
  public:
-  TwoClientBookmarksSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientBookmarksSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientBookmarksSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/two_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
index 379370d..0e2d52e 100644
--- a/chrome/browser/sync/test/live_sync/two_client_extensions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
@@ -4,8 +4,8 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/extensions_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/extensions_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using extensions_helper::AllProfilesHaveSameExtensionsAsVerifier;
 using extensions_helper::DisableExtension;
@@ -17,9 +17,9 @@ using extensions_helper::InstallExtension;
 using extensions_helper::InstallExtensionsPendingForSync;
 using extensions_helper::UninstallExtension;
 
-class TwoClientExtensionsSyncTest : public LiveSyncTest {
+class TwoClientExtensionsSyncTest : public SyncTest {
  public:
-  TwoClientExtensionsSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientExtensionsSyncTest() : SyncTest(TWO_CLIENT) {}
 
   virtual ~TwoClientExtensionsSyncTest() {}
 
diff --git a/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
index fd39c85..2161f4c 100644
--- a/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
@@ -6,8 +6,8 @@
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/sessions/session_state.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/passwords_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/passwords_helper.h"
 
 using passwords_helper::AddLogin;
 using passwords_helper::AllProfilesContainSamePasswordForms;
@@ -27,9 +27,9 @@ using webkit_glue::PasswordForm;
 
 static const char* kValidPassphrase = "passphrase!";
 
-class TwoClientPasswordsSyncTest : public LiveSyncTest {
+class TwoClientPasswordsSyncTest : public SyncTest {
  public:
-  TwoClientPasswordsSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientPasswordsSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientPasswordsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 60ef890..572ea95 100644
--- a/chrome/browser/sync/test/live_sync/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -5,8 +5,8 @@
 #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;
@@ -20,9 +20,9 @@ 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:
diff --git a/chrome/browser/sync/test/live_sync/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
index 3f10582..1e9081a 100644
--- a/chrome/browser/sync/test/live_sync/two_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
@@ -6,8 +6,8 @@
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/sessions/session_state.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/sessions_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/sessions_helper.h"
 
 using sessions_helper::CheckInitialState;
 using sessions_helper::GetLocalWindows;
@@ -15,9 +15,9 @@ using sessions_helper::GetSessionData;
 using sessions_helper::OpenTabAndGetLocalWindows;
 using sessions_helper::WindowsMatch;
 
-class TwoClientSessionsSyncTest : public LiveSyncTest {
+class TwoClientSessionsSyncTest : public SyncTest {
  public:
-  TwoClientSessionsSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientSessionsSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientSessionsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
index 2ca7c3f..c1ecb51 100644
--- a/chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
@@ -4,8 +4,8 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/themes_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
+#include "chrome/browser/sync/test/integration/themes_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 
 using themes_helper::GetCustomTheme;
 using themes_helper::GetThemeID;
@@ -18,9 +18,9 @@ using themes_helper::UsingCustomTheme;
 using themes_helper::UsingDefaultTheme;
 using themes_helper::UsingNativeTheme;
 
-class TwoClientThemesSyncTest : public LiveSyncTest {
+class TwoClientThemesSyncTest : public SyncTest {
  public:
-  TwoClientThemesSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientThemesSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientThemesSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
index ce49633..0e0b6f5 100644
--- a/chrome/browser/sync/test/live_sync/two_client_typed_urls_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
@@ -8,17 +8,17 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sessions/session_service.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/typed_urls_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;
 using typed_urls_helper::DeleteUrlFromHistory;
 using typed_urls_helper::GetTypedUrlsFromClient;
 
-class TwoClientTypedUrlsSyncTest : public LiveSyncTest {
+class TwoClientTypedUrlsSyncTest : public SyncTest {
  public:
-  TwoClientTypedUrlsSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+  TwoClientTypedUrlsSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientTypedUrlsSyncTest() {}
 
  private:
diff --git a/chrome/browser/sync/test/live_sync/typed_urls_helper.cc b/chrome/browser/sync/test/integration/typed_urls_helper.cc
index 0a0cc84..c21ee18 100644
--- a/chrome/browser/sync/test/live_sync/typed_urls_helper.cc
+++ b/chrome/browser/sync/test/integration/typed_urls_helper.cc
@@ -2,7 +2,7 @@
 // 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/typed_urls_helper.h"
+#include "chrome/browser/sync/test/integration/typed_urls_helper.h"
 
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
@@ -11,8 +11,8 @@
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#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/integration/sync_test.h"
 #include "content/browser/cancelable_request.h"
 
 using sync_datatype_helper::test;
diff --git a/chrome/browser/sync/test/live_sync/typed_urls_helper.h b/chrome/browser/sync/test/integration/typed_urls_helper.h
index 5447f62..b7923b17 100644
--- a/chrome/browser/sync/test/live_sync/typed_urls_helper.h
+++ b/chrome/browser/sync/test/integration/typed_urls_helper.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_TYPED_URLS_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_TYPED_URLS_HELPER_H_
+#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_TYPED_URLS_HELPER_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_TYPED_URLS_HELPER_H_
 #pragma once
 
 #include <vector>
@@ -48,4 +48,4 @@ base::Time GetTimestamp();
 
 }  // namespace typed_urls_helper
 
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_TYPED_URLS_HELPER_H_
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_TYPED_URLS_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/PRESUBMIT.py b/chrome/browser/sync/test/live_sync/PRESUBMIT.py
deleted file mode 100644
index f49f215..0000000
--- a/chrome/browser/sync/test/live_sync/PRESUBMIT.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/python
-# 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.
-
-"""Chromium presubmit script for src/chrome/browser/sync/test/live_sync.
-
-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-for more details on the presubmit API built into gcl.
-"""
-
-def GetPreferredTrySlaves():
-  return ['win', 'linux', 'mac', 'win_sync', 'linux_sync', 'mac_sync']
diff --git a/chrome/browser/sync/test/live_sync/sync_datatype_helper.h b/chrome/browser/sync/test/live_sync/sync_datatype_helper.h
deleted file mode 100644
index 8a2593c..0000000
--- a/chrome/browser/sync/test/live_sync/sync_datatype_helper.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_SYNC_DATATYPE_HELPER_H_
-#define CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_SYNC_DATATYPE_HELPER_H_
-#pragma once
-
-#include "base/basictypes.h"
-
-class LiveSyncTest;
-
-namespace sync_datatype_helper {
-
-// Associates an instance of LiveSyncTest with sync_datatype_helper. Must be
-// called before any of the methods in the per-datatype helper namespaces can be
-// used.
-void AssociateWithTest(LiveSyncTest* test);
-
-// Returns a pointer to the instance of LiveSyncTest associated with the
-// per-datatype helpers after making sure it is valid.
-LiveSyncTest* test();
-
-}  // namespace sync_datatype_helper
-
-#endif  // CHROME_BROWSER_SYNC_TEST_LIVE_SYNC_SYNC_DATATYPE_HELPER_H_
diff --git a/chrome/browser/sync/test/live_sync/sync_integration_test.py b/chrome/browser/sync/test/live_sync/sync_integration_test.py
deleted file mode 100644
index 17ed876..0000000
--- a/chrome/browser/sync/test/live_sync/sync_integration_test.py
+++ /dev/null
@@ -1,404 +0,0 @@
-#!/usr/bin/python2.4
-#
-# Copyright 2009 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.
-
-
-"""A tool to run a chrome sync integration test, used by the buildbot slaves.
-
-  When this is run, the current directory (cwd) should be the outer build
-  directory (e.g., chrome-release/build/).
-
-  For a list of command-line options, call this script with '--help'.
-"""
-
-__author__ = 'tejasshah@chromium.org'
-
-
-import logging
-import optparse
-import os
-import re
-import subprocess
-import sys
-import tempfile
-import time
-import urllib2
-
-
-USAGE = '%s [options] [test args]' % os.path.basename(sys.argv[0])
-HTTP_SERVER_URL = None
-HTTP_SERVER_PORT = None
-
-
-class PathNotFound(Exception): pass
-
-
-def ListSyncTests(test_exe_path):
-  """Returns list of the enabled live sync tests.
-
-  Args:
-    test_exe_path: Absolute path to test exe file.
-
-  Returns:
-    List of the tests that should be run.
-  """
-  command = [test_exe_path]
-  command.append('--gtest_list_tests')
-  proc = subprocess.Popen(
-      command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=1)
-  proc.wait()
-  sys.stdout.flush()
-  test_list = []
-  for line in proc.stdout.readlines():
-    if not line.strip():
-      continue
-    elif line.count("."):  # A new test collection
-      test_collection = line.split(".")[0].strip();
-    else:                  # An individual test to run
-      test_name = line.strip()
-      test_list.append("%s.%s" % (test_collection, test_name))
-  logging.info('List of tests to run: %s' % (test_list))
-  return test_list
-
-
-def GetUrl(command, port):
-  """Prepares the URL with appropriate command to send it to http server.
-
-  Args:
-    command: Command for HTTP server
-    port: Port number as a parameter to the command
-
-  Returns:
-    Formulated URL with the command and parameter.
-  """
-  command_url = (
-      '%s:%s/%s?port=%s'
-      % (HTTP_SERVER_URL, HTTP_SERVER_PORT, command, port))
-  return command_url
-
-
-def StartSyncServer(port=None):
-  """Starts a chrome sync server.
-
-  Args:
-    port: Port number on which sync server to start
-      (Default value none, in this case it uses random port).
-
-  Returns:
-    If success then port number on which sync server started, else None.
-  """
-  sync_port = None
-  if port:
-    start_sync_server_url = GetUrl('startsyncserver', port)
-  else:
-    start_sync_server_url = (
-        '%s:%s/%s' % (HTTP_SERVER_URL, HTTP_SERVER_PORT, 'startsyncserver'))
-  req = urllib2.Request(start_sync_server_url)
-  try:
-    response = urllib2.urlopen(req)
-  except urllib2.HTTPError, e:
-    logging.error(
-        'Could not start sync server, something went wrong.'
-        'Request URL: %s , Error Code: %s'% (start_sync_server_url, e.code))
-    return sync_port
-  except urllib2.URLError, e:
-    logging.error(
-        'Failed to reach HTTP server.Request URL: %s , Error: %s'
-        % (start_sync_server_url, e.reason))
-    return sync_port
-  else:
-    # Let's read response and parse the sync server port number.
-    output = response.readlines()
-    # Regex to ensure that sync server started and extract the port number.
-    regex = re.compile(
-        ".*not.*running.*on.*port\s*:\s*(\d+).*started.*new.*sync.*server",
-        re.IGNORECASE|re.MULTILINE|re.DOTALL)
-    r = regex.search(output[0])
-    if r:
-      sync_port = r.groups()[0]
-      if sync_port:
-        logging.info(
-            'Started Sync Server Successfully on Port:%s. Request URL: %s , '
-            'Response: %s' % (sync_port, start_sync_server_url, output))
-    response.fp._sock.recv = None
-    response.close()
-    return sync_port
-
-
-def CheckIfSyncServerRunning(port):
-  """Check the healthz status of a chrome sync server.
-
-  Args:
-    port: Port number on which sync server is running
-
-  Returns:
-    True: If sync server running.
-    False: Otherwise.
-  """
-  sync_server_healthz_url = ('%s:%s/healthz' % (HTTP_SERVER_URL, port))
-  req = urllib2.Request(sync_server_healthz_url)
-  try:
-    response = urllib2.urlopen(req)
-  except urllib2.HTTPError, e:
-    logging.error(
-        'It seems like Sync Server is not running, healthz check failed.'
-        'Request URL: %s , Error Code: %s'% (sync_server_healthz_url, e.code))
-    return False
-  except urllib2.URLError, e:
-    logging.error(
-        'Failed to reach Sync server, healthz check failed.'
-        'Request URL: %s , Error: %s'% (sync_server_healthz_url, e.reason))
-    return False
-  else:
-    logging.info(
-        'Sync Server healthz check Passed.Request URL: %s , Response: %s'
-        % (sync_server_healthz_url, response.readlines()))
-    response.fp._sock.recv = None
-    response.close()
-    return True
-
-
-def StopSyncServer(port):
-  """Stops a chrome sync server.
-
-  Args:
-    port: Port number on which sync server to Stop
-
-  Returns:
-    Success/Failure as a bool value.
-  """
-  stop_sync_server_url = GetUrl('stopsyncserver', port)
-  req = urllib2.Request(stop_sync_server_url)
-  logging.info("Stopping: %s" % stop_sync_server_url)
-  try:
-    response = urllib2.urlopen(req)
-  except urllib2.HTTPError, e:
-    logging.error(
-        'Could not stop sync server, something went wrong.'
-        'Request URL: %s , Error Code: %s'% (stop_sync_server_url, e.code))
-    return False
-  except urllib2.URLError, e:
-    logging.error(
-        'Failed to reach HTTP server.Request URL: %s , Error: %s'
-        % (stop_sync_server_url, e.reason))
-    return False
-  else:
-    logging.info(
-        'Stopped Sync Server Successfully.Request URL: %s , Response: %s'
-        % (stop_sync_server_url, response.readlines()))
-    response.fp._sock.recv = None
-    response.close()
-    return True
-
-
-def ShowGtestLikeFailure(test_exe_path, test_name):
-  """Show a gtest-like error when the test can't be run for some reason.
-
-  The scripts responsible for detecting test failures watch for this pattern.
-
-  Args:
-    test_exe_path: Absolute path to the test exe file.
-    test_name: The name of the test that wasn't run.
-  """
-  print '[ RUN      ] %s.%s' % (os.path.basename(test_exe_path), test_name)
-  print '[  FAILED  ]  %s.%s' % (os.path.basename(test_exe_path), test_name)
-
-
-def RunCommand(command):
-  """Runs the command list, printing its output and returning its exit status.
-
-  Prints the given command (which should be a list of one or more strings),
-  then runs it and prints its stdout and stderr together to stdout,
-  line-buffered, converting line endings to CRLF (see note below).  Waits for
-  the command to terminate and returns its status.
-
-  Args:
-    command: Command to run.
-
-  Returns:
-    Process exit code.
-  """
-  print '\n' + subprocess.list2cmdline(command) + '\n',
-  proc = subprocess.Popen(command, stdout=subprocess.PIPE,
-                          stderr=subprocess.STDOUT, bufsize=1)
-  last_flush_time = time.time()
-  while proc.poll() == None:
-    # Note that Windows Python converts \n to \r\n automatically whenever it
-    # encounters it written to a text file (including stdout).  The only way
-    # around it is to write to a binary file, which isn't feasible for stdout.
-    # So we're stuck with \r\n here even though we explicitly write \n.  (We
-    # could write \r instead, which doesn't get converted to \r\n, but that's
-    # probably more troublesome for people trying to read the files.)
-    line = proc.stdout.readline()
-    if line:
-      # The comma at the end tells python to not add \n, which is \r\n on
-      # Windows.
-      print line.rstrip() + '\n',
-      # Python on windows writes the buffer only when it reaches 4k. This is
-      # not fast enough. Flush each 10 seconds instead.
-      if time.time() - last_flush_time >= 10:
-        sys.stdout.flush()
-        last_flush_time = time.time()
-  sys.stdout.flush()
-  # Write the remaining buffer.
-  for line in proc.stdout.readlines():
-    print line.rstrip() + '\n',
-  sys.stdout.flush()
-  return proc.returncode
-
-
-def RunOneTest(test_exe_path, test_name, username, password):
-  """Run one live sync test after setting up a fresh server environment.
-
-  Args:
-    test_exe_path: Absolute path to test exe file.
-    test_name: the name of the one test to run.
-    username: test account username.
-    password: test account password.
-
-  Returns:
-    Zero for suceess.
-    Non-zero for failure.
-  """
-  def LogTestNotRun(message):
-    ShowGtestLikeFailure(test_exe_path, test_name)
-    logging.info('\n\n%s did not run because %s' % (test_name, message))
-
-  try:
-    logging.info('\n\n*************************************')
-    logging.info('%s Start' % (test_name))
-    sync_port = StartSyncServer()
-    if not sync_port:
-      LogTestNotRun('starting the sync server failed.')
-      return 1
-    if not CheckIfSyncServerRunning(sync_port):
-      LogTestNotRun('sync server running check failed.')
-      return 1
-    logging.info('Verified that sync server is running on port: %s', sync_port)
-    user_dir = GenericSetup(test_name)
-    logging.info('Created user data dir %s' % (user_dir))
-    command = [
-        test_exe_path,
-        '--gtest_filter='+ test_name,
-        '--user-data-dir=' + user_dir,
-        '--sync-user-for-test=' + username,
-        '--sync-password-for-test=' + password,
-        '--sync-url=' + HTTP_SERVER_URL + ':' + sync_port]
-    logging.info(
-        '%s will run with command: %s'
-        % (test_name, subprocess.list2cmdline(command)))
-    result = RunCommand(command)
-    StopSyncServer(sync_port)
-    return result
-  finally:
-    logging.info('%s End' % (test_name))
-
-
-def GenericSetup(test_name):
-  """Generic setup for running one test.
-
-  Args:
-    test_name: The name of a test that is about to be run.
-
-  Returns:
-    user_dir: Absolute path to user data dir created for the test.
-  """
-  user_dir = tempfile.mkdtemp(prefix=test_name + '.')
-  return user_dir
-
-
-def main_win(options, args):
-  """Main Function for win32 platform which drives the test here.
-
-  Using the target build configuration, run the executable given in the
-  first non-option argument, passing any following arguments to that
-  executable.
-
-  Args:
-    options: Option parameters.
-    args: Test arguments.
-
-  Returns:
-    Result: Zero for success/ Non-zero for failure.
-  """
-  final_result = 0
-  test_exe = 'sync_integration_tests.exe'
-  build_dir = os.path.abspath(options.build_dir)
-  test_exe_path = os.path.join(build_dir, options.target, test_exe)
-  if not os.path.exists(test_exe_path):
-    raise PathNotFound('Unable to find %s' % test_exe_path)
-  test_list = ListSyncTests(test_exe_path)
-  for test_name in test_list:
-    result = RunOneTest(
-        test_exe_path, test_name, options.sync_test_username,
-        options.sync_test_password)
-    # If any single test fails then final result should be failure
-    if result != 0:
-      final_result = result
-  return final_result
-
-if '__main__' == __name__:
-  # Initialize logging.
-  log_level = logging.INFO
-  logging.basicConfig(
-      level=log_level, format='%(asctime)s %(filename)s:%(lineno)-3d'
-      ' %(levelname)s %(message)s', datefmt='%y%m%d %H:%M:%S')
-
-  option_parser = optparse.OptionParser(usage=USAGE)
-
-  # Since the trailing program to run may have has command-line args of its
-  # own, we need to stop parsing when we reach the first positional argument.
-  option_parser.disable_interspersed_args()
-
-  option_parser.add_option(
-      '', '--target', default='Release', help='Build target (Debug or Release)'
-      ' Default value Release.')
-  option_parser.add_option(
-      '', '--build-dir', help='Path to main build directory'
-      '(the parent of the Release or Debug directory).')
-  option_parser.add_option(
-      '', '--http-server-url', help='Path to http server that can be used to'
-      ' start/stop sync server e.g. http://http_server_url_without_port')
-  option_parser.add_option(
-      '', '--http-server-port', help='Port on which http server is running'
-      ' e.g. 1010')
-  option_parser.add_option(
-      '', '--sync-test-username', help='Test username e.g. foo@gmail.com')
-  option_parser.add_option(
-      '', '--sync-test-password', help='Password for the test account')
-  options, args = option_parser.parse_args()
-  if not options.sync_test_password:
-    # Check along side this script under src/ first, and then check in
-    # the user profile dir.
-    password_file_path = os.path.join(
-        os.path.dirname(__file__),'sync_password')
-    if (not os.path.exists(password_file_path)):
-      password_file_path = os.path.join(
-          os.environ['USERPROFILE'], 'sync_password')
-
-    if os.path.exists(password_file_path):
-      fs = open(password_file_path, 'r')
-      lines = fs.readlines()
-      if len(lines)==1:
-        options.sync_test_password = lines[0].strip()
-      else:
-        sys.stderr.write('sync_password file is not in required format.\n')
-        sys.exit(1)
-    else:
-      sys.stderr.write(
-          'Missing required parameter- sync_test_password, please fix it.\n')
-      sys.exit(1)
-  if (not options.build_dir or not options.http_server_url or
-      not options.http_server_port or not options.sync_test_username):
-    sys.stderr.write('Missing required parameter, please fix it.\n')
-    option_parser.print_help()
-    sys.exit(1)
-  if sys.platform == 'win32':
-    HTTP_SERVER_URL = options.http_server_url
-    HTTP_SERVER_PORT = options.http_server_port
-    sys.exit(main_win(options, args))
-  else:
-    sys.stderr.write('Unknown sys.platform value %s\n' % repr(sys.platform))
-    sys.exit(1)
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f64d505..0c0df0e 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3276,57 +3276,57 @@
         'test/base/test_notification_tracker.cc',
         'test/base/test_notification_tracker.h',
         'test/data/resource.rc',
-        'browser/sync/test/live_sync/apps_helper.cc',
-        'browser/sync/test/live_sync/apps_helper.h',
-        'browser/sync/test/live_sync/autofill_helper.cc',
-        'browser/sync/test/live_sync/autofill_helper.h',
-        'browser/sync/test/live_sync/bookmarks_helper.cc',
-        'browser/sync/test/live_sync/bookmarks_helper.h',
-        'browser/sync/test/live_sync/extensions_helper.cc',
-        'browser/sync/test/live_sync/extensions_helper.h',
-        'browser/sync/test/live_sync/live_sync_test.cc',
-        'browser/sync/test/live_sync/live_sync_test.h',
-        'browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc',
-        'browser/sync/test/live_sync/many_client_passwords_sync_test.cc',
-        'browser/sync/test/live_sync/many_client_preferences_sync_test.cc',
-        'browser/sync/test/live_sync/migration_errors_test.cc',
-        'browser/sync/test/live_sync/multiple_client_bookmarks_sync_test.cc',
-        'browser/sync/test/live_sync/multiple_client_passwords_sync_test.cc',
-        'browser/sync/test/live_sync/multiple_client_preferences_sync_test.cc',
-        'browser/sync/test/live_sync/multiple_client_sessions_sync_test.cc',
-        'browser/sync/test/live_sync/multiple_client_typed_urls_sync_test.cc',
-        'browser/sync/test/live_sync/passwords_helper.cc',
-        'browser/sync/test/live_sync/passwords_helper.h',
-        'browser/sync/test/live_sync/preferences_helper.cc',
-        'browser/sync/test/live_sync/preferences_helper.h',
-        'browser/sync/test/live_sync/sessions_helper.cc',
-        'browser/sync/test/live_sync/sessions_helper.h',
-        'browser/sync/test/live_sync/single_client_apps_sync_test.cc',
-        'browser/sync/test/live_sync/single_client_bookmarks_sync_test.cc',
-        'browser/sync/test/live_sync/single_client_extensions_sync_test.cc',
-        'browser/sync/test/live_sync/single_client_passwords_sync_test.cc',
-        'browser/sync/test/live_sync/single_client_preferences_sync_test.cc',
-        'browser/sync/test/live_sync/single_client_sessions_sync_test.cc',
-        'browser/sync/test/live_sync/single_client_themes_sync_test.cc',
-        'browser/sync/test/live_sync/single_client_typed_urls_sync_test.cc',
-        'browser/sync/test/live_sync/sync_datatype_helper.cc',
-        'browser/sync/test/live_sync/sync_datatype_helper.h',
-        'browser/sync/test/live_sync/sync_errors_test.cc',
-        'browser/sync/test/live_sync/sync_extension_helper.cc',
-        'browser/sync/test/live_sync/sync_extension_helper.h',
-        'browser/sync/test/live_sync/themes_helper.cc',
-        'browser/sync/test/live_sync/themes_helper.h',
-        'browser/sync/test/live_sync/two_client_apps_sync_test.cc',
-        'browser/sync/test/live_sync/two_client_autofill_sync_test.cc',
-        'browser/sync/test/live_sync/two_client_bookmarks_sync_test.cc',
-        'browser/sync/test/live_sync/two_client_extensions_sync_test.cc',
-        'browser/sync/test/live_sync/two_client_passwords_sync_test.cc',
-        'browser/sync/test/live_sync/two_client_preferences_sync_test.cc',
-        'browser/sync/test/live_sync/two_client_sessions_sync_test.cc',
-        'browser/sync/test/live_sync/two_client_themes_sync_test.cc',
-        'browser/sync/test/live_sync/two_client_typed_urls_sync_test.cc',
-        'browser/sync/test/live_sync/typed_urls_helper.cc',
-        'browser/sync/test/live_sync/typed_urls_helper.h',
+        'browser/sync/test/integration/apps_helper.cc',
+        'browser/sync/test/integration/apps_helper.h',
+        'browser/sync/test/integration/autofill_helper.cc',
+        'browser/sync/test/integration/autofill_helper.h',
+        'browser/sync/test/integration/bookmarks_helper.cc',
+        'browser/sync/test/integration/bookmarks_helper.h',
+        'browser/sync/test/integration/extensions_helper.cc',
+        'browser/sync/test/integration/extensions_helper.h',
+        'browser/sync/test/integration/many_client_bookmarks_sync_test.cc',
+        'browser/sync/test/integration/many_client_passwords_sync_test.cc',
+        'browser/sync/test/integration/many_client_preferences_sync_test.cc',
+        'browser/sync/test/integration/migration_errors_test.cc',
+        'browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_passwords_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_preferences_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_sessions_sync_test.cc',
+        'browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc',
+        'browser/sync/test/integration/passwords_helper.cc',
+        'browser/sync/test/integration/passwords_helper.h',
+        'browser/sync/test/integration/preferences_helper.cc',
+        'browser/sync/test/integration/preferences_helper.h',
+        'browser/sync/test/integration/sessions_helper.cc',
+        'browser/sync/test/integration/sessions_helper.h',
+        'browser/sync/test/integration/single_client_apps_sync_test.cc',
+        'browser/sync/test/integration/single_client_bookmarks_sync_test.cc',
+        'browser/sync/test/integration/single_client_extensions_sync_test.cc',
+        'browser/sync/test/integration/single_client_passwords_sync_test.cc',
+        'browser/sync/test/integration/single_client_preferences_sync_test.cc',
+        'browser/sync/test/integration/single_client_sessions_sync_test.cc',
+        'browser/sync/test/integration/single_client_themes_sync_test.cc',
+        'browser/sync/test/integration/single_client_typed_urls_sync_test.cc',
+        'browser/sync/test/integration/sync_datatype_helper.cc',
+        'browser/sync/test/integration/sync_datatype_helper.h',
+        'browser/sync/test/integration/sync_errors_test.cc',
+        'browser/sync/test/integration/sync_extension_helper.cc',
+        'browser/sync/test/integration/sync_extension_helper.h',
+        'browser/sync/test/integration/sync_test.cc',
+        'browser/sync/test/integration/sync_test.h',
+        'browser/sync/test/integration/themes_helper.cc',
+        'browser/sync/test/integration/themes_helper.h',
+        'browser/sync/test/integration/two_client_apps_sync_test.cc',
+        'browser/sync/test/integration/two_client_autofill_sync_test.cc',
+        'browser/sync/test/integration/two_client_bookmarks_sync_test.cc',
+        'browser/sync/test/integration/two_client_extensions_sync_test.cc',
+        'browser/sync/test/integration/two_client_passwords_sync_test.cc',
+        'browser/sync/test/integration/two_client_preferences_sync_test.cc',
+        'browser/sync/test/integration/two_client_sessions_sync_test.cc',
+        'browser/sync/test/integration/two_client_themes_sync_test.cc',
+        'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
+        'browser/sync/test/integration/typed_urls_helper.cc',
+        'browser/sync/test/integration/typed_urls_helper.h',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -3419,32 +3419,32 @@
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
-        'browser/sync/test/live_sync/autofill_helper.cc',
-        'browser/sync/test/live_sync/autofill_helper.h',
-        'browser/sync/test/live_sync/bookmarks_helper.cc',
-        'browser/sync/test/live_sync/bookmarks_helper.h',
-        'browser/sync/test/live_sync/extensions_helper.cc',
-        'browser/sync/test/live_sync/extensions_helper.h',
-        'browser/sync/test/live_sync/live_sync_test.cc',
-        'browser/sync/test/live_sync/live_sync_test.h',
-        'browser/sync/test/live_sync/passwords_helper.cc',
-        'browser/sync/test/live_sync/passwords_helper.h',
-        'browser/sync/test/live_sync/performance/autofill_sync_perf_test.cc',
-        'browser/sync/test/live_sync/performance/bookmarks_sync_perf_test.cc',
-        'browser/sync/test/live_sync/performance/extensions_sync_perf_test.cc',
-        'browser/sync/test/live_sync/performance/sync_timing_helper.cc',
-        'browser/sync/test/live_sync/performance/sync_timing_helper.h',
-        'browser/sync/test/live_sync/performance/passwords_sync_perf_test.cc',
-        'browser/sync/test/live_sync/performance/sessions_sync_perf_test.cc',
-        'browser/sync/test/live_sync/performance/typed_urls_sync_perf_test.cc',
-        'browser/sync/test/live_sync/sessions_helper.cc',
-        'browser/sync/test/live_sync/sessions_helper.h',
-        'browser/sync/test/live_sync/sync_datatype_helper.cc',
-        'browser/sync/test/live_sync/sync_datatype_helper.h',
-        'browser/sync/test/live_sync/sync_extension_helper.cc',
-        'browser/sync/test/live_sync/sync_extension_helper.h',
-        'browser/sync/test/live_sync/typed_urls_helper.cc',
-        'browser/sync/test/live_sync/typed_urls_helper.h',
+        'browser/sync/test/integration/autofill_helper.cc',
+        'browser/sync/test/integration/autofill_helper.h',
+        'browser/sync/test/integration/bookmarks_helper.cc',
+        'browser/sync/test/integration/bookmarks_helper.h',
+        'browser/sync/test/integration/extensions_helper.cc',
+        'browser/sync/test/integration/extensions_helper.h',
+        'browser/sync/test/integration/passwords_helper.cc',
+        'browser/sync/test/integration/passwords_helper.h',
+        'browser/sync/test/integration/performance/autofill_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/extensions_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/sync_timing_helper.cc',
+        'browser/sync/test/integration/performance/sync_timing_helper.h',
+        'browser/sync/test/integration/performance/passwords_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/sessions_sync_perf_test.cc',
+        'browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc',
+        'browser/sync/test/integration/sessions_helper.cc',
+        'browser/sync/test/integration/sessions_helper.h',
+        'browser/sync/test/integration/sync_datatype_helper.cc',
+        'browser/sync/test/integration/sync_datatype_helper.h',
+        'browser/sync/test/integration/sync_extension_helper.cc',
+        'browser/sync/test/integration/sync_extension_helper.h',
+        'browser/sync/test/integration/sync_test.cc',
+        'browser/sync/test/integration/sync_test.h',
+        'browser/sync/test/integration/typed_urls_helper.cc',
+        'browser/sync/test/integration/typed_urls_helper.h',
         'test/base/out_of_proc_test_runner.cc',
         'test/base/test_notification_tracker.cc',
         'test/base/test_notification_tracker.h',