| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/profile_sync_service_mock.h" | 5 #include "chrome/browser/sync/profile_sync_service_mock.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/prefs/testing_pref_store.h" | 8 #include "base/prefs/testing_pref_store.h" |
| 9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| 10 #include "chrome/browser/signin/signin_manager_factory.h" | 10 #include "chrome/browser/signin/signin_manager_factory.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 } | 43 } |
| 44 | 44 |
| 45 ScopedVector<browser_sync::DeviceInfo> | 45 ScopedVector<browser_sync::DeviceInfo> |
| 46 ProfileSyncServiceMock::GetAllSignedInDevices() const { | 46 ProfileSyncServiceMock::GetAllSignedInDevices() const { |
| 47 ScopedVector<browser_sync::DeviceInfo> devices; | 47 ScopedVector<browser_sync::DeviceInfo> devices; |
| 48 std::vector<browser_sync::DeviceInfo*>* device_vector = | 48 std::vector<browser_sync::DeviceInfo*>* device_vector = |
| 49 GetAllSignedInDevicesMock(); | 49 GetAllSignedInDevicesMock(); |
| 50 devices.get() = *device_vector; | 50 devices.get() = *device_vector; |
| 51 return devices.Pass(); | 51 return devices.Pass(); |
| 52 } | 52 } |
| 53 | |
| 54 scoped_ptr<browser_sync::DeviceInfo> | |
| 55 ProfileSyncServiceMock::GetLocalDeviceInfo() const { | |
| 56 return scoped_ptr<browser_sync::DeviceInfo>(GetLocalDeviceInfoMock()).Pass(); | |
| 57 } | |
| OLD | NEW |