chrome/browser/extensions/api/sessions/sessions_apitest.cc - Issue 367153005: Sync: Refactoring of DEVICE_INFO syncable type - Part 1

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/extensions/api/sessions/sessions_apitest.cc

Issue 367153005: Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed build issues in browser_tests Created 6 years, 5 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 | « no previous file | chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc » ('j') | chrome/browser/sync/glue/local_device_info_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/sessions/sessions_apitest.cc

diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc

index cc208d22acc41d70e8295bf411b965d1d16fef9d..b09bdb69908950d95bb410601fc2207df9550139 100644

--- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc

+++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc

@@ -142,15 +142,6 @@ void ExtensionSessionsTest::CreateTestProfileSyncService() {

testing::ReturnRef(no_error));

ON_CALL(*service, GetActiveDataTypes()).WillByDefault(

testing::Return(preferred_types));

- ON_CALL(*service, GetLocalDeviceInfoMock()).WillByDefault(

- testing::Return(new browser_sync::DeviceInfo(

- std::string(kSessionTags[0]),

- "machine name",

- "Chromium 10k",

- "Chrome 10k",

- sync_pb::SyncEnums_DeviceType_TYPE_LINUX)));

- ON_CALL(*service, GetLocalSyncCacheGUID()).WillByDefault(

- testing::Return(std::string(kSessionTags[0])));

EXPECT_CALL(*service, AddObserver(testing::_)).Times(testing::AnyNumber());

EXPECT_CALL(*service, RemoveObserver(testing::_)).Times(testing::AnyNumber());