Device info datatype should be moved to components/sync_driver.

chrome/browser/search_engines/ui_thread_search_terms_data.cc

 // Copyright 2014 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/search_engines/ui_thread_search_terms_data.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
-#include "chrome/browser/sync/glue/device_info.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/search/search.h"
 #include "content/public/browser/browser_thread.h"
-#include "sync/protocol/sync.pb.h"
+#include "ui/base/device_form_factor.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_RLZ)
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
 using content::BrowserThread;
 
 // static
 std::string* UIThreadSearchTermsData::google_base_url_ = NULL;
@@ skipping 57 matching lines @@
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
   return std::string();
 }
 #endif
 
 std::string UIThreadSearchTermsData::GetSuggestClient() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_ANDROID)
-  sync_pb::SyncEnums::DeviceType device_type =
-      browser_sync::DeviceInfo::GetLocalDeviceType();
-  return device_type == sync_pb::SyncEnums_DeviceType_TYPE_PHONE ?
-    "chrome" : "chrome-omni";
+  return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE
+             ? "chrome"
+             : "chrome-omni";

[Peter Kasting, 2014/09/23 04:06:31]

Nit: Please wrap the ?: like the old code did

[stanisc, 2014/09/23 21:30:32]

Done. By the way this formatting was done by running "git cl format".

 #else
   return chrome::IsInstantExtendedAPIEnabled() ? "chrome-omni" : "chrome";
 #endif
 }
 
 std::string UIThreadSearchTermsData::GetSuggestRequestIdentifier() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_ANDROID)
-  sync_pb::SyncEnums::DeviceType device_type =
-      browser_sync::DeviceInfo::GetLocalDeviceType();
-  if (device_type == sync_pb::SyncEnums_DeviceType_TYPE_PHONE) {
+  if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE) {
     return OmniboxFieldTrial::EnableAnswersInSuggest() ?
         "chrome-mobile-ext-ansg" : "chrome-mobile-ext";
   }
   return OmniboxFieldTrial::EnableAnswersInSuggest() ?
       "chrome-ext-ansg" : "chrome-ext";
 #elif defined(OS_IOS)
   return OmniboxFieldTrial::EnableAnswersInSuggest() ?
       "chrome-ext-ansg" : "chrome-ext";
 #else
   return "chrome-ext";
@@ skipping 62 matching lines @@
     return version;
   }
   return "unknown";
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }