Revert "Adds UMA to measure when the data reduction proxy via header is missing"

components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.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 "components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs.h"
-#include "components/data_reduction_proxy/common/data_reduction_proxy_headers_test_utils.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_pref_names.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::Return;
 
 namespace {
 
 const char kProbeURLWithOKResponse[] = "http://ok.org/";
 
 const char kProxy[] = "proxy";
 
 }  // namespace
 
 namespace data_reduction_proxy {
 
+// Transform "normal"-looking headers (\n-separated) to the appropriate
+// input format for ParseRawHeaders (\0-separated).
+void HeadersToRaw(std::string* headers) {
+  std::replace(headers->begin(), headers->end(), '\n', '\0');
+  if (!headers->empty())
+    *headers += '\0';
+}
+
 ProbeURLFetchResult FetchResult(bool enabled, bool success) {
   if (enabled) {
     if (success)
       return SUCCEEDED_PROXY_ALREADY_ENABLED;
     return FAILED_PROXY_DISABLED;
   }
   if (success)
     return SUCCEEDED_PROXY_ENABLED;
   return FAILED_PROXY_ALREADY_DISABLED;
 }
@@ skipping 248 matching lines @@
       base::Bind(&DataReductionProxySettingsTestBase::
                  RegisterSyntheticFieldTrialCallback,
                  base::Unretained(this)));
 
   base::MessageLoop::current()->RunUntilIdle();
   CheckProxyConfigs(enabled_at_startup, false, false);
   EXPECT_EQ(enabled_at_startup, proxy_enabled_);
 }
 
 }  // namespace data_reduction_proxy