Fix broken clockstate.network2 histogram and add unit test

components/network_time/network_time_tracker.h

 // 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.
 
 #ifndef COMPONENTS_NETWORK_TIME_NETWORK_TIME_TRACKER_H_
 #define COMPONENTS_NETWORK_TIME_NETWORK_TIME_TRACKER_H_
 
 #include <stdint.h>
 #include <memory>
 
@@ skipping 109 matching lines @@
   void SetPublicKeyForTesting(const base::StringPiece& key);
 
   void SetTimeServerURLForTesting(const GURL& url);
 
   bool QueryTimeServiceForTesting();
 
   void WaitForFetchForTesting(uint32_t nonce);
 
   base::TimeDelta GetTimerDelayForTesting() const;
 
+  void EnableTimeQueriesForTesting();
+
  private:
   // Checks whether a network time query should be issued, and issues one if so.
   // Upon response, execution resumes in |OnURLFetchComplete|.
   void CheckTime();
 
   // Updates network time from a time server response, returning true
   // if successful.
   bool UpdateTimeFromResponse();
 
   // net::URLFetcherDelegate:
@@ skipping 14 matching lines @@
   base::TimeDelta backoff_;
   // Timer that runs CheckTime().  All backoff and delay is implemented by
   // changing the delay of this timer, with the result that CheckTime() may
   // assume that if it runs, it is eligible to issue a time query.
   base::RepeatingTimer timer_;
   scoped_refptr<net::URLRequestContextGetter> getter_;
   std::unique_ptr<net::URLFetcher> time_fetcher_;
   base::TimeTicks fetch_started_;
   std::unique_ptr<client_update_protocol::Ecdsa> query_signer_;
 
+  bool enable_time_queries_for_testing_ = false;
+
   // Run by WaitForFetchForTesting() and quit by OnURLFetchComplete().
   base::RunLoop* run_loop_for_testing_ = nullptr;
 
   // The |Clock| and |TickClock| are used to sanity-check one another, allowing
   // the NetworkTimeTracker to notice e.g. suspend/resume events and clock
   // resets.
   std::unique_ptr<base::Clock> clock_;
   std::unique_ptr<base::TickClock> tick_clock_;
 
   PrefService* pref_service_;
@@ skipping 18 matching lines @@
   bool time_query_completed_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkTimeTracker);
 };
 
 }  // namespace network_time
 
 #endif  // COMPONENTS_NETWORK_TIME_NETWORK_TIME_TRACKER_H_