Metrics fix for data reduction proxy.

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_SETTINGS_UNITTEST_H_
 #define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_SETTINGS_UNITTEST_H_
 
 
 #include "base/metrics/field_trial.h"
+#include "base/metrics/histogram_samples.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class PrefService;
 class TestingPrefServiceSimple;
 
+using spdyproxy::ProbeURLFetchResult;
+using spdyproxy::ProxyStartupState;
+
 template <class C>
 class MockDataReductionProxySettings : public C {
  public:
   MOCK_METHOD0(GetURLFetcher, net::URLFetcher*());
   MOCK_METHOD0(GetOriginalProfilePrefs, PrefService*());
   MOCK_METHOD0(GetLocalStatePrefs, PrefService*());
   MOCK_METHOD3(LogProxyState, void(
       bool enabled, bool restricted, bool at_startup));
+  MOCK_METHOD1(RecordProbeURLFetchResult,
+               void(ProbeURLFetchResult result));
+  MOCK_METHOD1(RecordStartupState,
+               void(ProxyStartupState state));
 
   // SetProxyConfigs should always call LogProxyState exactly once.
   virtual void SetProxyConfigs(
       bool enabled, bool restricted, bool at_startup) OVERRIDE {
     EXPECT_CALL(*this, LogProxyState(enabled, restricted, at_startup)).Times(1);
     C::SetProxyConfigs(enabled, restricted, at_startup);
   }
 };
 
 class DataReductionProxySettingsTestBase : public testing::Test {
  public:
   DataReductionProxySettingsTestBase();
   virtual ~DataReductionProxySettingsTestBase();
 
   void AddProxyToCommandLine();
 
   virtual void SetUp() OVERRIDE;
 
   template <class C> void ResetSettings();
   virtual void ResetSettings() = 0;
 
   template <class C> void SetProbeResult(
       const std::string& test_url,
       const std::string& response,
+      ProbeURLFetchResult state,
       bool success,
       int expected_calls);
   virtual void SetProbeResult(const std::string& test_url,
                               const std::string& response,
+                              ProbeURLFetchResult result,
                               bool success,
                               int expected_calls) = 0;
 
   void CheckProxyPref(const std::string& expected_servers,
                       const std::string& expected_mode);
   void CheckProxyConfigs(bool expected_enabled, bool expected_restricted);
   void CheckProbe(bool initially_enabled,
                   const std::string& probe_url,
                   const std::string& response,
                   bool request_success,
@@ skipping 20 matching lines @@
 class ConcreteDataReductionProxySettingsTest
     : public DataReductionProxySettingsTestBase {
  public:
   typedef MockDataReductionProxySettings<C> MockSettings;
   virtual void ResetSettings() OVERRIDE {
     return DataReductionProxySettingsTestBase::ResetSettings<C>();
   }
 
   virtual void SetProbeResult(const std::string& test_url,
                               const std::string& response,
+                              ProbeURLFetchResult result,
                               bool success,
                               int expected_calls) OVERRIDE {
     return DataReductionProxySettingsTestBase::SetProbeResult<C>(
-  test_url, response, success, expected_calls);
+  test_url, response, result, success, expected_calls);
   }
 };
 
 #endif  // CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_SETTINGS_UNITTEST_H_