Add client type in chrome-proxy header for desktop.

Make client an enum instead of string.

BUG=412982

Review URL: https://codereview.chromium.org/596053003

Cr-Commit-Position: refs/heads/master@{#297885}

android_webview/browser/net/aw_url_request_context_getter.cc

@@ -233,7 +233,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
   DCHECK(data_reduction_proxy_settings);
   data_reduction_proxy_auth_request_handler_.reset(
       new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
-          data_reduction_proxy::kClientAndroidWebview,
+          data_reduction_proxy::Client::WEBVIEW_ANDROID,
           data_reduction_proxy_settings->params(),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
 

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

@@ -17,6 +17,7 @@
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.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;
 
@@ -51,12 +52,28 @@ void DataReductionProxyChromeSettings::RegisterSyntheticFieldTrial(
 }
 
 // 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
 }

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h

@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "components/keyed_service/core/keyed_service.h"
 
@@ -47,7 +48,7 @@ class DataReductionProxyChromeSettings
       net::URLRequestContextGetter* request_context);
 
   // Gets the client type for the data reduction proxy.
-  static std::string GetClient();
+  static data_reduction_proxy::Client GetClient();
 
  private:
   // Registers the DataReductionProxyEnabled synthetic field trial with

components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc

@@ -31,10 +31,16 @@ namespace data_reduction_proxy {
 const char kAndroidWebViewProtocolVersion[] = "";
 #endif
 
-// The clients supported by the data reduction proxy.
-const char kClientAndroidWebview[] = "webview";
-const char kClientChromeAndroid[] = "android";
-const char kClientChromeIOS[] = "ios";
+#define CLIENT_ENUM(name, str_value) \
+    case name: return str_value;
+const char* GetString(Client client) {
+  switch (client) {
+    CLIENT_ENUMS_LIST
+  }
+  NOTREACHED();
+  return "";
+}
+#undef CLIENT_ENUM
 
 // static
 bool DataReductionProxyAuthRequestHandler::IsKeySetOnCommandLine() {
@@ -44,10 +50,10 @@ bool DataReductionProxyAuthRequestHandler::IsKeySetOnCommandLine() {
 }
 
 DataReductionProxyAuthRequestHandler::DataReductionProxyAuthRequestHandler(
-    const std::string& client,
+    Client client,
     DataReductionProxyParams* params,
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
-    : client_(client),
+    : client_(GetString(client)),
       data_reduction_proxy_params_(params),
       network_task_runner_(network_task_runner) {
   GetChromiumBuildAndPatch(ChromiumVersion(), &build_number_, &patch_number_);
@@ -55,11 +61,11 @@ DataReductionProxyAuthRequestHandler::DataReductionProxyAuthRequestHandler(
 }
 
 DataReductionProxyAuthRequestHandler::DataReductionProxyAuthRequestHandler(
-    const std::string& client,
+    Client client,
     const std::string& version,
     DataReductionProxyParams* params,
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
-    : client_(client),
+    : client_(GetString(client)),
       data_reduction_proxy_params_(params),
       network_task_runner_(network_task_runner) {
   GetChromiumBuildAndPatch(version, &build_number_, &patch_number_);

components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h

@@ -29,9 +29,25 @@ namespace data_reduction_proxy {
 extern const char kAndroidWebViewProtocolVersion[];
 #endif
 
-extern const char kClientAndroidWebview[];
-extern const char kClientChromeAndroid[];
-extern const char kClientChromeIOS[];
+#define CLIENT_ENUMS_LIST \
+    CLIENT_ENUM(UNKNOWN, "") \
+    CLIENT_ENUM(WEBVIEW_ANDROID, "webview") \
+    CLIENT_ENUM(CHROME_ANDROID, "android") \
+    CLIENT_ENUM(CHROME_IOS, "ios") \
+    CLIENT_ENUM(CHROME_MAC, "mac") \
+    CLIENT_ENUM(CHROME_CHROMEOS, "chromeos") \
+    CLIENT_ENUM(CHROME_LINUX, "linux") \
+    CLIENT_ENUM(CHROME_WINDOWS, "win") \
+    CLIENT_ENUM(CHROME_FREEBSD, "freebsd") \
+    CLIENT_ENUM(CHROME_OPENBSD, "openbsd") \
+    CLIENT_ENUM(CHROME_SOLARIS, "solaris") \
+    CLIENT_ENUM(CHROME_QNX, "qnx")
+
+#define CLIENT_ENUM(name, str_value) name,
+typedef enum {
+  CLIENT_ENUMS_LIST
+} Client;
+#undef CLIENT_ENUM
 
 class DataReductionProxyParams;
 
@@ -42,7 +58,7 @@ class DataReductionProxyAuthRequestHandler {
   // Constructs a DataReductionProxyAuthRequestHandler object with the given
   // client type, params, and network task runner.
   DataReductionProxyAuthRequestHandler(
-      const std::string& client,
+      Client client,
       DataReductionProxyParams* params,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
 
@@ -89,7 +105,7 @@ class DataReductionProxyAuthRequestHandler {
 
   // Visible for testing.
   DataReductionProxyAuthRequestHandler(
-      const std::string& client,
+      Client client,
       const std::string& version,
       DataReductionProxyParams* params,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);

components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler_unittest.cc

@@ -23,14 +23,6 @@ namespace {
 const char kChromeProxyHeader[] = "chrome-proxy";
 const char kOtherProxy[] = "testproxy:17";
 
-
-#if defined(OS_ANDROID)
-  const char kClient[] = "android";
-#elif defined(OS_IOS)
-  const char kClient[] = "ios";
-#else
-  const char kClient[] = "";
-#endif
 const char kVersion[] = "0.1.2.3";
 const char kExpectedBuild[] = "2";
 const char kExpectedPatch[] = "3";
@@ -42,49 +34,66 @@ const char kExpectedSession[] = "0-1633771873-1633771873-1633771873";
 const char kTestKey2[] = "test-key2";
 const char kExpectedCredentials2[] = "c911fdb402f578787562cf7f00eda972";
 const char kExpectedSession2[] = "0-1633771873-1633771873-1633771873";
-#if defined(OS_ANDROID)
-const char kExpectedHeader2[] =
-    "ps=0-1633771873-1633771873-1633771873, "
-    "sid=c911fdb402f578787562cf7f00eda972, b=2, p=3, c=android";
-const char kExpectedHeader3[] =
-    "ps=86401-1633771873-1633771873-1633771873, "
-    "sid=d7c1c34ef6b90303b01c48a6c1db6419, b=2, p=3, c=android";
-const char kExpectedHeader4[] =
-    "ps=0-1633771873-1633771873-1633771873, "
-    "sid=c911fdb402f578787562cf7f00eda972, c=android";
-#elif defined(OS_IOS)
-const char kExpectedHeader2[] =
-    "ps=0-1633771873-1633771873-1633771873, "
-    "sid=c911fdb402f578787562cf7f00eda972, b=2, p=3, c=ios";
-const char kExpectedHeader3[] =
-    "ps=86401-1633771873-1633771873-1633771873, "
-    "sid=d7c1c34ef6b90303b01c48a6c1db6419, b=2, p=3, c=ios";
-const char kExpectedHeader4[] =
-    "ps=0-1633771873-1633771873-1633771873, "
-    "sid=c911fdb402f578787562cf7f00eda972, c=ios";
-#else
-const char kExpectedHeader2[] =
-    "ps=0-1633771873-1633771873-1633771873, "
-    "sid=c911fdb402f578787562cf7f00eda972, b=2, p=3";
-const char kExpectedHeader3[] =
-    "ps=86401-1633771873-1633771873-1633771873, "
-    "sid=d7c1c34ef6b90303b01c48a6c1db6419, b=2, p=3";
-const char kExpectedHeader4[] =
-    "ps=0-1633771873-1633771873-1633771873, "
-    "sid=c911fdb402f578787562cf7f00eda972";
-#endif
-
 const char kDataReductionProxyKey[] = "12345";
 }  // namespace
 
 
 namespace data_reduction_proxy {
 namespace {
+
+#if defined(OS_ANDROID)
+const Client kClient = Client::CHROME_ANDROID;
+const char kClientStr[] = "android";
+#elif defined(OS_IOS)
+const Client kClient = Client::CHROME_IOS;
+const char kClientStr[] = "ios";
+#elif defined(OS_MACOSX)
+const Client kClient = Client::CHROME_MAC;
+const char kClientStr[] = "mac";
+#elif defined(OS_CHROMEOS)
+const Client kClient = Client::CHROME_CHROMEOS;
+const char kClientStr[] = "chromeos";
+#elif defined(OS_LINUX)
+const Client kClient = Client::CHROME_LINUX;
+const char kClientStr[] = "linux";
+#elif defined(OS_WIN)
+const Client kClient = Client::CHROME_WINDOWS;
+const char kClientStr[] = "win";
+#elif defined(OS_FREEBSD)
+const Client kClient = Client::CHROME_FREEBSD;
+const char kClientStr[] = "freebsd";
+#elif defined(OS_OPENBSD)
+const Client kClient = Client::CHROME_OPENBSD;
+const char kClientStr[] = "openbsd";
+#elif defined(OS_SOLARIS)
+const Client kClient = Client::CHROME_SOLARIS;
+const char kClientStr[] = "solaris";
+#elif defined(OS_QNX)
+const Client kClient = Client::CHROME_QNX;
+const char kClientStr[] = "qnx";
+#else
+const Client kClient = Client::UNKNOWN;
+const char kClientStr[] = "";
+#endif
+
+const std::string kExpectedHeader2 =
+    std::string("ps=0-1633771873-1633771873-1633771873, ") +
+    std::string("sid=c911fdb402f578787562cf7f00eda972, b=2, p=3, c=") +
+    kClientStr;
+const std::string kExpectedHeader3 =
+    std::string("ps=86401-1633771873-1633771873-1633771873, ") +
+    std::string("sid=d7c1c34ef6b90303b01c48a6c1db6419, b=2, p=3, c=") +
+    kClientStr;
+const std::string kExpectedHeader4 =
+    std::string("ps=0-1633771873-1633771873-1633771873, ") +
+    std::string("sid=c911fdb402f578787562cf7f00eda972, c=") +
+    kClientStr;
+
 class TestDataReductionProxyAuthRequestHandler
     : public DataReductionProxyAuthRequestHandler {
  public:
   TestDataReductionProxyAuthRequestHandler(
-      const std::string& client,
+      Client client,
       const std::string& version,
       DataReductionProxyParams* params,
       base::MessageLoopProxy* loop_proxy)
@@ -143,7 +152,7 @@ TEST_F(DataReductionProxyAuthRequestHandlerTest, Authorization) {
                                                         loop_proxy_);
   auth_handler.Init();
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(auth_handler.client_, kClient);
+  EXPECT_EQ(auth_handler.client_, kClientStr);
   EXPECT_EQ(kExpectedBuild, auth_handler.build_number_);
   EXPECT_EQ(kExpectedPatch, auth_handler.patch_number_);
   EXPECT_EQ(auth_handler.key_, kTestKey);