Index: chrome/browser/sync/test/integration/sessions_helper.h |
diff --git a/chrome/browser/sync/test/integration/sessions_helper.h b/chrome/browser/sync/test/integration/sessions_helper.h |
index b997b7023a58f938b42c106abc999696364e05ad..d4e9b1df4f629000e1a8d4472ab6109455d5bc93 100644 |
--- a/chrome/browser/sync/test/integration/sessions_helper.h |
+++ b/chrome/browser/sync/test/integration/sessions_helper.h |
@@ -6,6 +6,7 @@ |
#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SESSIONS_HELPER_H_ |
#include <algorithm> |
+#include <string> |
#include <vector> |
#include "base/compiler_specific.h" |
@@ -18,8 +19,8 @@ class GURL; |
namespace sessions_helper { |
skym
2016/09/14 22:29:58
Opened crbug.com/647044
maxbogue
2016/09/15 00:43:53
Acknowledged.
|
-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. |
@@ -63,8 +64,8 @@ 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); |
@@ -117,7 +118,7 @@ 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. |