Chromium Code Reviews| Index: chrome/browser/ui/webui/history_ui.cc |
| diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc |
| index 1c604f6e12d807b107aa67d4915051ec4f371a0e..4005e679db9905754cd8f45c60bc7c51ff5ea289 100644 |
| --- a/chrome/browser/ui/webui/history_ui.cc |
| +++ b/chrome/browser/ui/webui/history_ui.cc |
| @@ -233,9 +233,9 @@ void GetDeviceNameAndType(const ProfileSyncService* sync_service, |
| const std::string& client_id, |
| std::string* name, |
| std::string* type) { |
| - if (sync_service && sync_service->sync_initialized()) { |
| + if (sync_service && sync_service->GetDeviceInfoTracker()) { |
| scoped_ptr<browser_sync::DeviceInfo> device_info = |
| - sync_service->GetDeviceInfo(client_id); |
| + sync_service->GetDeviceInfoTracker()->GetDeviceInfo(client_id); |
|
pavely
2014/09/17 23:04:38
Same issue: Under what conditions GetDeviceInfoTra
stanisc
2014/09/18 22:46:54
This one should be fine. GetDeviceInfoTracker() sh
|
| if (device_info.get()) { |
| *name = device_info->client_name(); |
| switch (device_info->device_type()) { |
| @@ -251,7 +251,7 @@ void GetDeviceNameAndType(const ProfileSyncService* sync_service, |
| return; |
| } |
| } else { |
| - NOTREACHED() << "Got a remote history entry but no ProfileSyncService."; |
| + NOTREACHED() << "Got a remote history entry but no DeviceInfoTracker."; |
| } |
| *name = l10n_util::GetStringUTF8(IDS_HISTORY_UNKNOWN_DEVICE); |
| *type = kDeviceTypeLaptop; |