Remove XP-only ImmDisableTextFrameService call.

content/browser/browser_main_runner.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 "content/public/browser/browser_main_runner.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "ui/base/ime/input_method_initializer.h"
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/tracing_controller_android.h"
 #endif
 
 #if defined(OS_WIN)
-#include "base/win/windows_version.h"
 #include "ui/base/win/scoped_ole_initializer.h"
 #include "ui/gfx/win/direct_write.h"
 #endif
 
 namespace content {
 
 namespace {
 
 bool g_exited_main_message_loop = false;
 
@@ skipping 29 matching lines @@
 
       const base::TimeTicks start_time_step1 = base::TimeTicks::Now();
 
       SkGraphics::Init();
 
 #if !defined(OS_IOS)
       if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
         base::debug::WaitForDebugger(60, true);
 #endif
 
-#if defined(OS_WIN)
-      if (base::win::GetVersion() < base::win::VERSION_VISTA) {
-        // When "Extend support of advanced text services to all programs"
-        // (a.k.a. Cicero Unaware Application Support; CUAS) is enabled on
-        // Windows XP and handwriting modules shipped with Office 2003 are
-        // installed, "penjpn.dll" and "skchui.dll" will be loaded and then
-        // crash unless a user installs Office 2003 SP3. To prevent these
-        // modules from being loaded, disable TSF entirely. crbug.com/160914.
-        // TODO(yukawa): Add a high-level wrapper for this instead of calling
-        // Win32 API here directly.
-        ImmDisableTextFrameService(static_cast<DWORD>(-1));
-      }
-#endif  // OS_WIN
-
       base::StatisticsRecorder::Initialize();
 
       notification_service_.reset(new NotificationServiceImpl);
 
 #if defined(OS_WIN)
       // Ole must be initialized before starting message pump, so that TSF
       // (Text Services Framework) module can interact with the message pump
       // on Windows 8 Metro mode.
       ole_initializer_.reset(new ui::ScopedOleInitializer);
       // Enable DirectWrite font rendering if needed.
@@ skipping 136 matching lines @@
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 // static
 bool BrowserMainRunner::ExitedMainMessageLoop() {
   return g_exited_main_message_loop;
 }
 
 }  // namespace content