3 files changed, 22 insertions, 0 deletions
diff --git a/ios/chrome/test/DEPS b/ios/chrome/test/DEPS
index 0614aac..335ddd6 100644
--- a/ios/chrome/test/DEPS
+++ b/ios/chrome/test/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+components/network_time",
   "+ios/chrome/browser",
   "+ios/public/provider/chrome",
   "+ios/public/test",
diff --git a/ios/chrome/test/testing_application_context.cc b/ios/chrome/test/testing_application_context.cc
index 4b70b86..014a913 100644
--- a/ios/chrome/test/testing_application_context.cc
+++ b/ios/chrome/test/testing_application_context.cc
@@ -5,6 +5,8 @@
 #include "ios/chrome/test/testing_application_context.h"
 
 #include "base/logging.h"
+#include "base/time/default_tick_clock.h"
+#include "components/network_time/network_time_tracker.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 
 TestingApplicationContext::TestingApplicationContext()
@@ -54,22 +56,38 @@ const std::string& TestingApplicationContext::GetApplicationLocale() {
 
 ios::ChromeBrowserStateManager*
 TestingApplicationContext::GetChromeBrowserStateManager() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   return chrome_browser_state_manager_;
 }
 
 metrics::MetricsService* TestingApplicationContext::GetMetricsService() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   return nullptr;
 }
 
 policy::BrowserPolicyConnector*
 TestingApplicationContext::GetBrowserPolicyConnector() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   return nullptr;
 }
 
 rappor::RapporService* TestingApplicationContext::GetRapporService() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   return nullptr;
 }
 
 net_log::ChromeNetLog* TestingApplicationContext::GetNetLog() {
+  DCHECK(thread_checker_.CalledOnValidThread());
   return nullptr;
 }
+
+network_time::NetworkTimeTracker*
+TestingApplicationContext::GetNetworkTimeTracker() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (!network_time_tracker_) {
+    DCHECK(local_state_);
+    network_time_tracker_.reset(new network_time::NetworkTimeTracker(
+        make_scoped_ptr(new base::DefaultTickClock), local_state_));
+  }
+  return network_time_tracker_.get();
+}
diff --git a/ios/chrome/test/testing_application_context.h b/ios/chrome/test/testing_application_context.h
index 37505f6..0c073c3 100644
--- a/ios/chrome/test/testing_application_context.h
+++ b/ios/chrome/test/testing_application_context.h
@@ -6,6 +6,7 @@
 #define IOS_CHROME_TEST_TESTING_APPLICATION_CONTEXT_H_
 
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "ios/chrome/browser/application_context.h"
 
@@ -33,12 +34,14 @@ class TestingApplicationContext : public ApplicationContext {
   policy::BrowserPolicyConnector* GetBrowserPolicyConnector() override;
   rappor::RapporService* GetRapporService() override;
   net_log::ChromeNetLog* GetNetLog() override;
+  network_time::NetworkTimeTracker* GetNetworkTimeTracker() override;
 
  private:
   base::ThreadChecker thread_checker_;
   std::string application_locale_;
   PrefService* local_state_;
   ios::ChromeBrowserStateManager* chrome_browser_state_manager_;
+  scoped_ptr<network_time::NetworkTimeTracker> network_time_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingApplicationContext);
 };