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

Unified Diff: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc

Issue 612103005: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/toolbar/recent_tabs_sub_menu_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
index 87abc1547edcf4d346142483c67eeba0328eacf6..9e2c21112cf568d3105e2a8697fe3aba8199bdff 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/sessions/session_service_factory.h"
#include "chrome/browser/sessions/session_types.h"
#include "chrome/browser/sessions/tab_restore_service_factory.h"
-#include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
#include "chrome/browser/sync/glue/synced_session.h"
#include "chrome/browser/sync/profile_sync_service_mock.h"
#include "chrome/browser/sync/sessions/sessions_sync_manager.h"
@@ -28,6 +27,7 @@
#include "chrome/test/base/menu_model_test.h"
#include "chrome/test/base/testing_profile.h"
#include "components/sessions/serialized_navigation_entry_test_helper.h"
+#include "components/sync_driver/local_device_info_provider_mock.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_utils.h"
#include "grit/generated_resources.h"
@@ -118,7 +118,7 @@ class RecentTabsSubMenuModelTest
public:
RecentTabsSubMenuModelTest()
: sync_service_(&testing_profile_),
- local_device_(new browser_sync::LocalDeviceInfoProviderMock(
+ local_device_(new sync_driver::LocalDeviceInfoProviderMock(
"RecentTabsSubMenuModelTest",
"Test Machine",
"Chromium 10k",
@@ -163,7 +163,7 @@ class RecentTabsSubMenuModelTest
testing::NiceMock<ProfileSyncServiceMock> sync_service_;
scoped_ptr<browser_sync::SessionsSyncManager> manager_;
- scoped_ptr<browser_sync::LocalDeviceInfoProviderMock> local_device_;
+ scoped_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;
};
// Test disabled "Recently closed" header with no foreign tabs.
« no previous file with comments | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698