Revert r151669 and r155589 as non-Aura Metro mode is gone

content/browser/browser_main_loop.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/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
@@ skipping 64 matching lines @@
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "content/browser/theme_helper_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
 
-#include "base/win/text_services_message_filter.h"
 #include "content/browser/system_message_window_win.h"
 #include "content/common/sandbox_win.h"
 #include "net/base/winsock_init.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
 #if defined(USE_GLIB)
 #include <glib-object.h>
 #endif
 
@@ skipping 398 matching lines @@
   }
 
   {
     system_stats_monitor_.reset(new base::debug::TraceEventSystemStatsMonitor(
         base::ThreadTaskRunnerHandle::Get()));
   }
 #endif  // !defined(OS_IOS)
 
 #if defined(OS_WIN)
   system_message_window_.reset(new SystemMessageWindowWin);
-
-  if (base::win::IsTSFAwareRequired()) {
-    // Create a TSF message filter for the message loop. MessageLoop takes
-    // ownership of the filter.
-    scoped_ptr<base::win::TextServicesMessageFilter> tsf_message_filter(
-      new base::win::TextServicesMessageFilter);
-    if (tsf_message_filter->Init()) {
-      base::MessageLoopForUI::current()->SetMessageFilter(
-        tsf_message_filter.PassAs<base::MessageLoopForUI::MessageFilter>());
-    }
-  }
 #endif
 
   if (parts_)
     parts_->PostMainMessageLoopStart();
 
 #if defined(OS_ANDROID)
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTexturePeer")
     SurfaceTexturePeer::InitInstance(new SurfaceTexturePeerBrowserImpl());
   }
@@ skipping 601 matching lines @@
       base::TimeDelta::FromSeconds(delay_secs));
 }
 
 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
       trace_file, TracingController::TracingFileResultCallback());
 }
 
 }  // namespace content