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

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

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 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 e3191c1f47274fec229221d750097fc7c595a0d3..1c1bb0822ea9773d47c48019b813f8cf033b5cc6 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
@@ -60,14 +60,13 @@ class DummyRouter : public sync_sessions::LocalSessionEventRouter {
class AppMenuControllerTest : public CocoaProfileTest {
public:
AppMenuControllerTest()
- : local_device_(new sync_driver::LocalDeviceInfoProviderMock(
+ : local_device_(new syncer::LocalDeviceInfoProviderMock(
"AppMenuControllerTest",
"Test Machine",
"Chromium 10k",
"Chrome 10k",
sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
- "device_id")) {
- }
+ "device_id")) {}
void SetUp() override {
CocoaProfileTest::SetUp();
@@ -76,7 +75,7 @@ class AppMenuControllerTest : public CocoaProfileTest {
controller_.reset([[AppMenuController alloc] initWithBrowser:browser()]);
fake_model_.reset(new MockAppMenuModel);
- sync_prefs_.reset(new sync_driver::SyncPrefs(profile()->GetPrefs()));
+ sync_prefs_.reset(new syncer::SyncPrefs(profile()->GetPrefs()));
manager_.reset(new sync_sessions::SessionsSyncManager(
ProfileSyncServiceFactory::GetForProfile(profile())
->GetSyncClient()
@@ -117,9 +116,9 @@ class AppMenuControllerTest : public CocoaProfileTest {
std::unique_ptr<MockAppMenuModel> fake_model_;
private:
- std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_;
+ std::unique_ptr<syncer::SyncPrefs> sync_prefs_;
std::unique_ptr<sync_sessions::SessionsSyncManager> manager_;
- std::unique_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;
+ std::unique_ptr<syncer::LocalDeviceInfoProviderMock> local_device_;
};
TEST_F(AppMenuControllerTest, Initialized) {
« no previous file with comments | « chrome/browser/ui/avatar_button_error_controller.cc ('k') | chrome/browser/ui/passwords/manage_passwords_view_utils_desktop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698