Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2415)

Unified Diff: chrome/browser/sync/glue/session_sync_test_helper.cc

Issue 2343463003: [Sync] Fix namespaces for the sync_sessions component. (Closed)
Patch Set: Fix Android. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/session_sync_test_helper.cc
diff --git a/chrome/browser/sync/glue/session_sync_test_helper.cc b/chrome/browser/sync/glue/session_sync_test_helper.cc
index 16cae098c1308d8b5e5ed6bc3f6e430e51ef1143..cf08f3ad552a6fcbc0dd4f00c4b917acc91f3bac 100644
--- a/chrome/browser/sync/glue/session_sync_test_helper.cc
+++ b/chrome/browser/sync/glue/session_sync_test_helper.cc
@@ -12,8 +12,7 @@
#include "components/sync_sessions/synced_session.h"
#include "testing/gtest/include/gtest/gtest.h"
-
-namespace browser_sync {
+namespace sync_sessions {
skym 2016/09/14 22:29:58 Please move to components/sync_sessions before thi
maxbogue 2016/09/15 00:43:53 Done.
static const char* kClientName = "name";
static const char* kAppId = "app_id";
@@ -51,9 +50,9 @@ void SessionSyncTestHelper::AddWindowSpecifics(
void SessionSyncTestHelper::VerifySyncedSession(
const std::string& tag,
const std::vector<std::vector<SessionID::id_type>>& windows,
- const sync_driver::SyncedSession& session) {
+ const SyncedSession& session) {
ASSERT_EQ(tag, session.session_tag);
- ASSERT_EQ(sync_driver::SyncedSession::TYPE_LINUX, session.device_type);
+ ASSERT_EQ(SyncedSession::TYPE_LINUX, session.device_type);
ASSERT_EQ(kClientName, session.session_name);
ASSERT_EQ(windows.size(), session.windows.size());
@@ -63,7 +62,7 @@ void SessionSyncTestHelper::VerifySyncedSession(
windows.begin();
win_iter != windows.end(); ++win_iter, ++i) {
sessions::SessionWindow* win_ptr;
- sync_driver::SyncedSession::SyncedWindowMap::const_iterator map_iter =
+ SyncedSession::SyncedWindowMap::const_iterator map_iter =
session.windows.find(i);
if (map_iter != session.windows.end())
win_ptr = map_iter->second;
@@ -144,4 +143,4 @@ sync_pb::SessionSpecifics SessionSyncTestHelper::BuildForeignSession(
return meta;
}
-} // namespace browser_sync
+} // namespace sync_sessions

Powered by Google App Engine
This is Rietveld 408576698