Refactor syncable DEVICE_INFO type from ChangeProcessor to SyncableService - part 3.

chrome/browser/ui/webui/history_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/history_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 215 matching lines @@
 bool IsLocalOnlyResult(const BrowsingHistoryHandler::HistoryEntry& entry) {
   return entry.entry_type == BrowsingHistoryHandler::HistoryEntry::LOCAL_ENTRY;
 }
 
 // Gets the name and type of a device for the given sync client ID.
 // |name| and |type| are out parameters.
 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 GetDeviceInfoTracher() returns NULL?

[stanisc, 2014/09/18 22:46:54]

This one should be fine. GetDeviceInfoTracker() should be non-NULL when backend
is initialized. We cannot call this method without having a device client_id
which comes from DeviceInfoTracker in the first place.
I'll add a comment.

     if (device_info.get()) {
       *name = device_info->client_name();
       switch (device_info->device_type()) {
         case sync_pb::SyncEnums::TYPE_PHONE:
           *type = kDeviceTypePhone;
           break;
         case sync_pb::SyncEnums::TYPE_TABLET:
           *type = kDeviceTypeTablet;
           break;
         default:
           *type = kDeviceTypeLaptop;
       }
       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;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BrowsingHistoryHandler
@@ skipping 750 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile));
 }
 
 // static
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
 }