Refactor network_time_test_utils

components/network_time/network_time_test_utils.h

Index: components/network_time/network_time_test_utils.h
diff --git a/components/network_time/network_time_test_utils.h b/components/network_time/network_time_test_utils.h
index 09dee4c7e05c958273d0da005f78088e57fe527c..97ed8dce53509e93ea1fda438cc1f54103447b83 100644
--- a/components/network_time/network_time_test_utils.h
+++ b/components/network_time/network_time_test_utils.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace test {
@@ -19,16 +18,32 @@ class ScopedFeatureList;
 class FieldTrialList;
 }  // namespace base
 
+namespace net {
+namespace test_server {
+struct HttpRequest;
+class HttpResponse;
+}  // namespace test_server
+}  // namespace net
+
 namespace network_time {
-// A test fixture that allows configuring the network time queries field trial.
-class FieldTrialTest : public ::testing::Test {
+
+std::unique_ptr<net::test_server::HttpResponse> GoodTimeResponseHandler(
+    const net::test_server::HttpRequest& request);
+
+// Allows tests to configure the network time queries field trial.
+class FieldTrialTest {
  public:
-  FieldTrialTest();
-  ~FieldTrialTest() override;
+  enum FetchesOnDemandStatus {
+    ENABLE_FETCHES_ON_DEMAND,
+    DISABLE_FETCHES_ON_DEMAND,
+  };
 
- protected:
-  void SetNetworkQueriesWithVariationsService(bool enable,
-                                              float query_probability);
+  FieldTrialTest();
+  virtual ~FieldTrialTest();
+  void SetNetworkQueriesWithVariationsService(
+      bool enable,
+      float query_probability,
+      FetchesOnDemandStatus fetches_on_demand);
 
  private:
   std::unique_ptr<base::FieldTrialList> field_trial_list_;