| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index f61d372681fb71c4568f367243ca2ac2aa78a13b..2f952b43985d38856b6cc104fc168528361b85dc 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -144,10 +144,6 @@
|
| #include "ui/base/layout.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| -#if defined(OS_ANDROID)
|
| -#include "chrome/browser/metrics/thread_watcher_android.h"
|
| -#endif
|
| -
|
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| #include "chrome/browser/first_run/upgrade_util_linux.h"
|
| #include "chrome/browser/sxs_linux.h"
|
| @@ -1467,10 +1463,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
| MetricsService::SetExecutionPhase(MetricsService::THREAD_WATCHER_START);
|
| ThreadWatcherList::StartWatchingAll(parsed_command_line());
|
|
|
| -#if defined(OS_ANDROID)
|
| - ThreadWatcherAndroid::RegisterApplicationStatusListener();
|
| -#endif
|
| -
|
| #if !defined(DISABLE_NACL)
|
| if (parsed_command_line().HasSwitch(switches::kPnaclDir)) {
|
| PathService::Override(chrome::DIR_PNACL_BASE,
|
|
|