Revert 217172 "Enable high resolution time for TimeTicks::Now on..."

trunk/src/chrome/browser/chrome_browser_main_win.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chrome_browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 12 matching lines @@
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/browser_util_win.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/uninstall_browser_prompt.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "content/public/common/main_function_params.h"
 #include "grit/app_locale_settings.h"
 #include "grit/chromium_strings.h"
@@ skipping 91 matching lines @@
                   << user_shortcut_locations[i];
         }
       }
     } else {
       NOTREACHED();
     }
   }
   return result;
 }
 
-void MaybeEnableHighResolutionTimeEverywhere() {
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  bool user_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableHighResolutionTime);
-  if (user_enabled || channel == chrome::VersionInfo::CHANNEL_CANARY) {
-    bool is_enabled = base::TimeTicks::SetNowIsHighResNowIfSupported();
-    if (is_enabled && !user_enabled) {
-      // Ensure that all of the renderers will enable it too.
-      CommandLine::ForCurrentProcess()->AppendSwitch(
-          switches::kEnableHighResolutionTime);
-    }
-  }
-}
-
 // ChromeBrowserMainPartsWin ---------------------------------------------------
 
 ChromeBrowserMainPartsWin::ChromeBrowserMainPartsWin(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainParts(parameters) {
-  MaybeEnableHighResolutionTimeEverywhere();
   if (base::win::IsMetroProcess()) {
     typedef const wchar_t* (*GetMetroSwitches)(void);
     GetMetroSwitches metro_switches_proc = reinterpret_cast<GetMetroSwitches>(
         GetProcAddress(base::win::GetMetroModule(),
                        "GetMetroCommandLineSwitches"));
     if (metro_switches_proc) {
       string16 metro_switches = (*metro_switches_proc)();
       if (!metro_switches.empty()) {
         CommandLine extra_switches(CommandLine::NO_PROGRAM);
         extra_switches.ParseFromString(metro_switches);
@@ skipping 218 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }