Use HighResNow whenever possible on Windows.

This has been enabled on Canary channel for sometime now and seems to be
safe there. We also now have data from stable channel showing there are
no unexpectedly buggy CPUs out there. This should be safe to turn on for
all users with adequate CPUs, which is the majority of them.

BUG=158234

Review URL: https://codereview.chromium.org/41953002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230968 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 16 deletions

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index da27afa..fe2bb11 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -682,8 +682,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
       MachBroker::ChildSendTaskPortToParent();
     }
 #elif defined(OS_WIN)
-    if (command_line.HasSwitch(switches::kEnableHighResolutionTime))
-      base::TimeTicks::SetNowIsHighResNowIfSupported();
+    base::TimeTicks::SetNowIsHighResNowIfSupported();
 
     // This must be done early enough since some helper functions like
     // IsTouchEnabled, needed to load resources, may call into the theme dll.
diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc
index 8e6bde3..cf61f04 100644
--- a/content/browser/browser_child_process_host_impl.cc
+++ b/content/browser/browser_child_process_host_impl.cc
@@ -153,9 +153,6 @@ void BrowserChildProcessHostImpl::Launch(
 #if defined(OS_POSIX)
     switches::kChildCleanExit,
 #endif
-#if defined(OS_WIN)
-    switches::kEnableHighResolutionTime,
-#endif
   };
   cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches,
                              arraysize(kForwardSwitches));
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index f47f963..1ba9352 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1078,9 +1078,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
 #if defined(OS_POSIX)
     switches::kChildCleanExit,
 #endif
-#if defined(OS_WIN)
-    switches::kEnableHighResolutionTime,
-#endif
   };
   renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
                                  arraysize(kSwitchNames));
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 8ea70fd..b0ac4d8e 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -428,11 +428,6 @@ const char kEnableGpuClientTracing[]        = "enable-gpu-client-tracing";
 const char kEnableHighDpiCompositingForFixedPosition[] =
      "enable-high-dpi-fixed-position-compositing";
 
-#if defined(OS_WIN)
-// Use high resolution timers for TimeTicks.
-const char kEnableHighResolutionTime[]      = "enable-high-resolution-time";
-#endif
-
 // Enable HTML Imports
 extern const char kEnableHTMLImports[]      = "enable-html-imports";
 
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index b5ee4207..cd3a5fa 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -131,9 +131,6 @@ CONTENT_EXPORT extern const char kEnableGestureTapHighlight[];
 extern const char kEnableGpuBenchmarking[];
 extern const char kEnableGpuClientTracing[];
 CONTENT_EXPORT extern const char kEnableHighDpiCompositingForFixedPosition[];
- #if defined(OS_WIN)
-extern const char kEnableHighResolutionTime[];
-#endif
 extern const char kEnableHTMLImports[];
 CONTENT_EXPORT extern const char kEnableInbandTextTracks[];
 extern const char kEnableInputModeAttribute[];