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

chrome/browser/sync/test/integration/single_client_bookmarks_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 "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;
 using bookmarks_helper::GetBookmarkBarNode;
 using bookmarks_helper::GetOtherNode;
 using bookmarks_helper::ModelMatchesVerifier;
 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:
   DISALLOW_COPY_AND_ASSIGN(SingleClientBookmarksSyncTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, OfflineToOnline) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   DisableNetwork(GetProfile(0));
@@ skipping 109 matching lines @@
       0, tier1_a, 0, L"Toronto Maple Leafs", GURL("http://mapleleafs.nhl.com"));
   const BookmarkNode* wynn = AddURL(0, bar, 1, L"Wynn",
       GURL("http://www.wynnlasvegas.com"));
 
   Move(0, wynn, tier3_b, 0);
   Move(0, leafs, tier3_b, 0);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
       "Move after addition of bookmarks."));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 }