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

Unified Diff: chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm

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/ui/cocoa/app_menu/app_menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm
index e1dafbdf17291295307afc3b8aef14ea4c2c7a97..308242f03216bc524e80a0ba2e08d2c88f5bbda7 100644
--- a/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm
@@ -49,11 +49,11 @@ class MockAppMenuModel : public AppMenuModel {
MOCK_METHOD2(ExecuteCommand, void(int command_id, int event_flags));
};
-class DummyRouter : public browser_sync::LocalSessionEventRouter {
+class DummyRouter : public sync_sessions::LocalSessionEventRouter {
public:
~DummyRouter() override {}
void StartRoutingTo(
- browser_sync::LocalSessionEventHandler* handler) override {}
+ sync_sessions::LocalSessionEventHandler* handler) override {}
void Stop() override {}
};
@@ -77,12 +77,12 @@ class AppMenuControllerTest : public CocoaProfileTest {
fake_model_.reset(new MockAppMenuModel);
sync_prefs_.reset(new sync_driver::SyncPrefs(profile()->GetPrefs()));
- manager_.reset(new browser_sync::SessionsSyncManager(
+ manager_.reset(new sync_sessions::SessionsSyncManager(
ProfileSyncServiceFactory::GetForProfile(profile())
->GetSyncClient()
->GetSyncSessionsClient(),
sync_prefs_.get(), local_device_.get(),
- std::unique_ptr<browser_sync::LocalSessionEventRouter>(
+ std::unique_ptr<sync_sessions::LocalSessionEventRouter>(
new DummyRouter()),
base::Closure(), base::Closure()));
manager_->MergeDataAndStartSyncing(
@@ -97,7 +97,7 @@ class AppMenuControllerTest : public CocoaProfileTest {
helper->ExportToSessionsSyncManager(manager_.get());
}
- sync_driver::OpenTabsUIDelegate* GetOpenTabsDelegate() {
+ sync_sessions::OpenTabsUIDelegate* GetOpenTabsDelegate() {
return manager_.get();
}
@@ -118,7 +118,7 @@ class AppMenuControllerTest : public CocoaProfileTest {
private:
std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_;
- std::unique_ptr<browser_sync::SessionsSyncManager> manager_;
+ std::unique_ptr<sync_sessions::SessionsSyncManager> manager_;
std::unique_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;
};

Powered by Google App Engine
This is Rietveld 408576698