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

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/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;
 using themes_helper::HasOrWillHaveCustomTheme;
 using themes_helper::ThemeIsPendingInstall;
 using themes_helper::UseCustomTheme;
 using themes_helper::UseDefaultTheme;
 using themes_helper::UseNativeTheme;
 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:
   DISALLOW_COPY_AND_ASSIGN(TwoClientThemesSyncTest);
 };
 
 // TODO(akalin): Add tests for model association (i.e., tests that
 // start with SetupClients(), change the theme state, then call
 // SetupSync()).
 
@@ skipping 202 matching lines @@
   ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
 
   ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
   ASSERT_TRUE(AwaitQuiescence());
 
   ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
   ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
   ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
   ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
 }