chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm - Issue 612103005: Device info datatype should be moved to components/sync_driver.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

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

« no previous file with comments | « chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc ('k') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

index 05333b3e49cee9952411748113c9ab19318df805..26b18a1b23558ee326a5c2d722b3a5e786cec7c8 100644

--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

@@ -7,7 +7,6 @@

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

-#include "chrome/browser/sync/glue/local_device_info_provider_mock.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/sync/sessions/sessions_sync_manager.h"

#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"

@@ -21,6 +20,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/grit/generated_resources.h"

#include "chrome/test/base/testing_profile.h"

+#include "components/sync_driver/local_device_info_provider_mock.h"

#include "grit/theme_resources.h"

#include "sync/api/fake_sync_change_processor.h"

#include "sync/api/sync_error_factory_mock.h"

@@ -60,7 +60,7 @@ class WrenchMenuControllerTest

: public CocoaProfileTest {

public:

WrenchMenuControllerTest()

- : local_device_(new browser_sync::LocalDeviceInfoProviderMock(

+ : local_device_(new sync_driver::LocalDeviceInfoProviderMock(

"WrenchMenuControllerTest",

"Test Machine",

"Chromium 10k",

@@ -117,7 +117,7 @@ class WrenchMenuControllerTest

private:

scoped_ptr<browser_sync::SessionsSyncManager> manager_;

- scoped_ptr<browser_sync::LocalDeviceInfoProviderMock> local_device_;

+ scoped_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;

};

TEST_F(WrenchMenuControllerTest, Initialized) {