Revert of Cleanup DataReductionProxy (DRP) Brotli code

components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h
index aae331c8d97485f534e1339a6f1c90c7bafd2930..47a2df688ef9b67e3cae1d230b089395b4206270 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h
@@ -72,8 +72,6 @@
   // Time after the unix epoch that Now() reports.
   void set_offset(const base::TimeDelta& now_offset);
 
-  using DataReductionProxyRequestOptions::GetHeaderValueForTesting;
-
  private:
   base::TimeDelta now_offset_;
 };
@@ -189,7 +187,7 @@
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       std::unique_ptr<DataReductionProxyConfig> config,
       std::unique_ptr<DataReductionProxyEventCreator> event_creator,
-      std::unique_ptr<TestDataReductionProxyRequestOptions> request_options,
+      std::unique_ptr<DataReductionProxyRequestOptions> request_options,
       std::unique_ptr<DataReductionProxyConfigurator> configurator,
       net::NetLog* net_log,
       bool enabled);
@@ -210,10 +208,6 @@
     return config_client_.get();
   }
 
-  TestDataReductionProxyRequestOptions* test_request_options() const {
-    return test_request_options_;
-  }
-
   void set_proxy_delegate(
       std::unique_ptr<DataReductionProxyDelegate> proxy_delegate) {
     proxy_delegate_ = std::move(proxy_delegate);
@@ -241,8 +235,6 @@
 
   // Reporting fraction last set via SetPingbackReportingFraction.
   float pingback_reporting_fraction_;
-
-  TestDataReductionProxyRequestOptions* test_request_options_;
 };
 
 // Test version of |DataStore|. Uses an in memory hash map to store data.
@@ -379,9 +371,11 @@
   // This creates a |DataReductionProxyNetworkDelegate| and
   // |DataReductionProxyInterceptor|, using them in the |net::URLRequestContext|
   // for |request_context_storage|. |request_context_storage| takes ownership of
-  // the created objects.
+  // the created objects. If |exclude_chrome_proxy_header_for_testing| is set
+  // to true, chrome-proxy header would not be added to the request headers.
   void AttachToURLRequestContext(
-      net::URLRequestContextStorage* request_context_storage) const;
+      net::URLRequestContextStorage* request_context_storage,
+      bool exclude_chrome_proxy_header_for_testing) const;
 
   // Enable the Data Reduction Proxy, simulating a successful secure proxy
   // check. This can only be called if not built with WithTestConfigurator,