Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / net / spdyproxy / data_reduction_proxy_chrome_settings.cc

diff --git a/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc b/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
index 26be2de..7a3d619 100644 (file)
--- a/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
+++ b/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
@@ -6,19 +6,18 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
-#include "base/strings/string_split.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/chrome_version_info.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_configurator.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using data_reduction_proxy::Client;
 using data_reduction_proxy::DataReductionProxyParams;
 using data_reduction_proxy::DataReductionProxySettings;
 
@@ -37,7 +36,6 @@ void DataReductionProxyChromeSettings::InitDataReductionProxySettings(
   SetProxyConfigurator(configurator);
   DataReductionProxySettings::InitDataReductionProxySettings(
       profile_prefs,
-      local_state_prefs,
       request_context);
   DataReductionProxySettings::SetOnDataReductionEnabledCallback(
       base::Bind(&DataReductionProxyChromeSettings::RegisterSyntheticFieldTrial,
@@ -54,22 +52,28 @@ void DataReductionProxyChromeSettings::RegisterSyntheticFieldTrial(
 }
 
 // static
-std::string DataReductionProxyChromeSettings::GetBuildAndPatchNumber() {
-  chrome::VersionInfo version_info;
-  std::vector<std::string> version_parts;
-  base::SplitString(version_info.Version(), '.', &version_parts);
-  if (version_parts.size() != 4)
-    return "";
-  return version_parts[2] + version_parts[3];
-}
-
-// static
-std::string DataReductionProxyChromeSettings::GetClient() {
+Client DataReductionProxyChromeSettings::GetClient() {
 #if defined(OS_ANDROID)
-  return data_reduction_proxy::kClientChromeAndroid;
+  return Client::CHROME_ANDROID;
 #elif defined(OS_IOS)
-  return data_reduction_proxy::kClientChromeIOS;
+  return Client::CHROME_IOS;
+#elif defined(OS_MACOSX)
+  return Client::CHROME_MAC;
+#elif defined(OS_CHROMEOS)
+  return Client::CHROME_CHROMEOS;
+#elif defined(OS_LINUX)
+  return Client::CHROME_LINUX;
+#elif defined(OS_WIN)
+  return Client::CHROME_WINDOWS;
+#elif defined(OS_FREEBSD)
+  return Client::CHROME_FREEBSD;
+#elif defined(OS_OPENBSD)
+  return Client::CHROME_OPENBSD;
+#elif defined(OS_SOLARIS)
+  return Client::CHROME_SOLARIS;
+#elif defined(OS_QNX)
+  return Client::CHROME_QNX;
 #else
-  return "";
+  return Client::UNKNOWN;
 #endif
 }