| 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 f65ddc257150cdca1e6f5af435afd9580ca4ccc5..23f9bb506f8973b0c8077591a03c77b79a1f16ee 100644
|
| --- a/chrome/browser/ui/webui/history_ui.cc
|
| +++ b/chrome/browser/ui/webui/history_ui.cc
|
| @@ -28,7 +28,6 @@
|
| #include "chrome/browser/history/web_history_service.h"
|
| #include "chrome/browser/history/web_history_service_factory.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/sync/glue/device_info.h"
|
| #include "chrome/browser/sync/profile_sync_service.h"
|
| #include "chrome/browser/sync/profile_sync_service_factory.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| @@ -42,6 +41,7 @@
|
| #include "components/bookmarks/browser/bookmark_model.h"
|
| #include "components/bookmarks/browser/bookmark_utils.h"
|
| #include "components/search/search.h"
|
| +#include "components/sync_driver/device_info.h"
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_source.h"
|
| #include "content/public/browser/url_data_source.h"
|
| @@ -236,7 +236,7 @@ void GetDeviceNameAndType(const ProfileSyncService* sync_service,
|
| // DeviceInfoTracker becomes available when Sync backend gets initialed.
|
| // It must exist in order for remote history entries to be available.
|
| if (sync_service && sync_service->GetDeviceInfoTracker()) {
|
| - scoped_ptr<browser_sync::DeviceInfo> device_info =
|
| + scoped_ptr<sync_driver::DeviceInfo> device_info =
|
| sync_service->GetDeviceInfoTracker()->GetDeviceInfo(client_id);
|
| if (device_info.get()) {
|
| *name = device_info->client_name();
|
|
|