chrome/browser/sync/glue/local_device_info_provider_mock.h - Issue 597423002: 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/sync/glue/local_device_info_provider_mock.h

Issue 597423002: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor CR feedback addressed. 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/glue/local_device_info_provider_impl.cc ('k') | chrome/browser/sync/glue/local_device_info_provider_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/local_device_info_provider_mock.h

diff --git a/chrome/browser/sync/glue/local_device_info_provider_mock.h b/chrome/browser/sync/glue/local_device_info_provider_mock.h

index a795aeaa8d83e6112be5669d4f5d6a9347c2a3b3..09c890b8a269304f770a27171db2a4b4af9a05c4 100644

--- a/chrome/browser/sync/glue/local_device_info_provider_mock.h

+++ b/chrome/browser/sync/glue/local_device_info_provider_mock.h

@@ -5,12 +5,13 @@

#ifndef CHROME_BROWSER_SYNC_GLUE_LOCAL_DEVICE_INFO_PROVIDER_MOCK_H_

#define CHROME_BROWSER_SYNC_GLUE_LOCAL_DEVICE_INFO_PROVIDER_MOCK_H_

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

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

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

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

namespace browser_sync {

-class LocalDeviceInfoProviderMock : public LocalDeviceInfoProvider {

+class LocalDeviceInfoProviderMock

+ : public sync_driver::LocalDeviceInfoProvider {

public:

// Creates uninitialized provider.

LocalDeviceInfoProviderMock();

@@ -24,7 +25,7 @@ class LocalDeviceInfoProviderMock : public LocalDeviceInfoProvider {

const std::string& signin_scoped_device_id);

virtual ~LocalDeviceInfoProviderMock();

- virtual const DeviceInfo* GetLocalDeviceInfo() const OVERRIDE;

+ virtual const sync_driver::DeviceInfo* GetLocalDeviceInfo() const OVERRIDE;

virtual std::string GetLocalSyncCacheGUID() const OVERRIDE;

virtual void Initialize(

const std::string& cache_guid,

@@ -37,7 +38,7 @@ class LocalDeviceInfoProviderMock : public LocalDeviceInfoProvider {

private:

bool is_initialized_;

- scoped_ptr<DeviceInfo> local_device_info_;

+ scoped_ptr<sync_driver::DeviceInfo> local_device_info_;

base::CallbackList<void(void)> callback_list_;

};