[Sync] Fix namespaces for the sync_sessions component.

chrome/browser/sync/test/integration/sessions_helper.h

 // Copyright (c) 2012 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_SESSIONS_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_
 
 #include <algorithm>
+#include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/sessions/core/session_types.h"
 #include "components/sync/syncable/nigori_util.h"
 #include "components/sync_sessions/synced_session.h"
 
 class GURL;
 
 namespace sessions_helper {
 
-typedef std::vector<const sync_driver::SyncedSession*> SyncedSessionVector;
-typedef sync_driver::SyncedSession::SyncedWindowMap SessionWindowMap;
+typedef std::vector<const sync_sessions::SyncedSession*> SyncedSessionVector;
+typedef sync_sessions::SyncedSession::SyncedWindowMap SessionWindowMap;
 
 // Wrapper around a SyncedWindowMap that will automatically delete the
 // SessionWindow pointers it holds.
 class ScopedWindowMap {
  public:
   ScopedWindowMap();
   explicit ScopedWindowMap(SessionWindowMap* windows);
   ~ScopedWindowMap();
 
   const SessionWindowMap* Get() const;
@@ skipping 23 matching lines @@
 // Returns number of foreign sessions for a profile.
 int GetNumForeignSessions(int index);
 
 // Fills the sessions vector with the model associator's foreign session data.
 // Caller owns |sessions|, but not SyncedSessions objects within.
 // Returns true if foreign sessions were found, false otherwise.
 bool GetSessionData(int index, SyncedSessionVector* sessions);
 
 // Compares a foreign session based on the first session window.
 // Returns true based on the comparison of the session windows.
-bool CompareSyncedSessions(const sync_driver::SyncedSession* lhs,
-                           const sync_driver::SyncedSession* rhs);
+bool CompareSyncedSessions(const sync_sessions::SyncedSession* lhs,
+                           const sync_sessions::SyncedSession* rhs);
 
 // Sort a SyncedSession vector using our custom SyncedSession comparator.
 void SortSyncedSessions(SyncedSessionVector* sessions);
 
 // Compares two tab navigations base on the parameters we sync.
 // (Namely, we don't sync state or type mask)
 bool NavigationEquals(const sessions::SerializedNavigationEntry& expected,
                       const sessions::SerializedNavigationEntry& actual);
 
 // Verifies that two SessionWindows match.
@@ skipping 32 matching lines @@
 // Wait for a session change to propagate to the model associator.  Will not
 // return until each url in |urls| has been found.
 bool WaitForTabsToLoad(int index, const std::vector<GURL>& urls);
 
 // Check if the session model associator's knows that the current open tab
 // has this url.
 bool ModelAssociatorHasTabWithUrl(int index, const GURL& url);
 
 // Stores a pointer to the local session for a given profile in |session|.
 // Returns true on success, false on failure.
-bool GetLocalSession(int index, const sync_driver::SyncedSession** session);
+bool GetLocalSession(int index, const sync_sessions::SyncedSession** session);
 
 // Deletes the foreign session with tag |session_tag| from the profile specified
 // by |index|. This will affect all synced clients.
 // Note: We pass the session_tag in by value to ensure it's not a reference
 // to the session tag within the SyncedSession we plan to delete.
 void DeleteForeignSession(int index, std::string session_tag);
 
 }  // namespace sessions_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_