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

chrome/browser/sync/test/integration/two_client_sessions_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/memory/scoped_vector.h"
 #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;
 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:
   DISALLOW_COPY_AND_ASSIGN(TwoClientSessionsSyncTest);
 };
 
 static const char* kValidPassphrase = "passphrase!";
 static const char* kURL1 = "chrome://sync";
 static const char* kURL2 = "chrome://version";
 
@@ skipping 313 matching lines @@
   ASSERT_TRUE(GetSessionData(0, &sessions0));
   ASSERT_TRUE(GetSessionData(1, &sessions1));
 
   // Verify client 1's foreign session matches client 0's current window and
   // vice versa.
   ASSERT_EQ(1U, sessions0.size());
   ASSERT_EQ(1U, sessions1.size());
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, client0_windows.get()));
   ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, client1_windows.get()));
 }