Add probe to warm data reduction proxy

components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h

Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h
index eae8bae018e4d2e0bf16678b97cd3f613bb3dcd7..c12159be612a79c6df6c1ee4c381105da9d819f7 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h
@@ -62,6 +62,7 @@ class MockDataReductionProxySettings : public C {
   MockDataReductionProxySettings<C>(int flags)
       : C(new DataReductionProxyParams(flags)) {}
   MOCK_METHOD0(GetURLFetcher, net::URLFetcher*());
+  MOCK_METHOD0(GetURLFetcherForWarming, net::URLFetcher*());
   MOCK_METHOD0(GetOriginalProfilePrefs, PrefService*());
   MOCK_METHOD0(GetLocalStatePrefs, PrefService*());
   MOCK_METHOD3(LogProxyState, void(
@@ -107,11 +108,13 @@ class DataReductionProxySettingsTestBase : public testing::Test {
 
   template <class C> void SetProbeResult(
       const std::string& test_url,
+      const std::string& warming_test_url,

[marq (ping after 24h), 2014/06/16 17:23:35]

Be consistent in your wording: warmup vs. warming, here and elsewhere.

[bengr, 2014/06/17 03:42:10]

Done.

       const std::string& response,
       ProbeURLFetchResult state,
       bool success,
       int expected_calls);
   virtual void SetProbeResult(const std::string& test_url,
+                              const std::string& warming_test_url,
                               const std::string& response,
                               ProbeURLFetchResult result,
                               bool success,
@@ -122,12 +125,14 @@ class DataReductionProxySettingsTestBase : public testing::Test {
                          bool expected_fallback_restricted);
   void CheckProbe(bool initially_enabled,
                   const std::string& probe_url,
+                  const std::string& warming_url,
                   const std::string& response,
                   bool request_success,
                   bool expected_enabled,
                   bool expected_restricted,
                   bool expected_fallback_restricted);
   void CheckProbeOnIPChange(const std::string& probe_url,
+                            const std::string& warming_url,
                             const std::string& response,
                             bool request_success,
                             bool expected_enabled,
@@ -157,12 +162,18 @@ class ConcreteDataReductionProxySettingsTest
   }
 
   virtual void SetProbeResult(const std::string& test_url,
+                              const std::string& warming_test_url,
                               const std::string& response,
                               ProbeURLFetchResult result,
                               bool success,
                               int expected_calls) OVERRIDE {
     return DataReductionProxySettingsTestBase::SetProbeResult<C>(
-  test_url, response, result, success, expected_calls);
+        test_url,
+        warming_test_url,
+        response,
+        result,
+        success,
+        expected_calls);
   }
 };