Refactoring client/version to util

components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h
index c340a2f9f450027a2ee4c24a26472c7d987c1439..4cf3c7c4c44d8bcc3c9db09c21bec86ce0a1bb3c 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h
@@ -10,20 +10,21 @@
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_util.h"
 
 namespace net {
 class HostPortPair;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class ProxyServer;
 class URLRequest;
 }
 
 namespace data_reduction_proxy {
@@ -33,41 +34,20 @@ extern const char kCredentialsHeaderOption[];
 extern const char kSecureSessionHeaderOption[];
 extern const char kBuildNumberHeaderOption[];
 extern const char kPatchNumberHeaderOption[];
 extern const char kClientHeaderOption[];
 extern const char kExperimentsOption[];
 
 #if defined(OS_ANDROID)
 extern const char kAndroidWebViewProtocolVersion[];
 #endif
 
-#define CLIENT_ENUMS_LIST                  \
-  CLIENT_ENUM(UNKNOWN, "")                 \
-  CLIENT_ENUM(CRONET_ANDROID, "cronet")    \
-  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 DataReductionProxyConfig;
 
 class DataReductionProxyRequestOptions {
  public:
   static bool IsKeySetOnCommandLine();
 
   // Constructs a DataReductionProxyRequestOptions object with the given
   // client type, and config.
   DataReductionProxyRequestOptions(Client client,
                                    DataReductionProxyConfig* config);