Upstreaming ChromeBrowserMainAndroid

chrome/browser/chrome_browser_main_posix.cc

Index: chrome/browser/chrome_browser_main_posix.cc
diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc
index 618d379758e0a3ebf7d891f4376907798114aaa2..3fac661818631cfc1be14727a3871d6e9b4114a5 100644
--- a/chrome/browser/chrome_browser_main_posix.cc
+++ b/chrome/browser/chrome_browser_main_posix.cc
@@ -22,10 +22,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
-#if defined(OS_ANDROID)
-#include <asm/page.h>  // for PAGE_SIZE needed by PTHREAD_STACK_MIN
-#endif
-
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h"
 #include "chrome/browser/printing/print_dialog_gtk.h"
@@ -283,11 +279,6 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopStart() {
 void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() {
 #if defined(OS_CHROMEOS)
   NOTREACHED();  // Should not ever happen on ChromeOS.
-#elif defined(OS_ANDROID)
-  // TODO(port) Update this as needed.
-  // Probably should not ever happen on Android, but at the time of this
-  // writing, Android isn't even using ChromeBrowserMainPartsPosix yet.
-  NOTREACHED();
 #elif defined(OS_MACOSX)
   // Not called on Mac because we load the locale files differently.
   NOTREACHED();