Android: Mark more classes as non-mobile.

chrome/browser/browser_shutdown.cc

Index: chrome/browser/browser_shutdown.cc
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index a3669a620849d7fcd3b986f67dd25556e819ac3c..329d5cada575c175d2370d6286638915f7437bee 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -21,7 +21,6 @@
 #include "base/time/time.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/first_run/upgrade_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
@@ -39,6 +38,10 @@
 #include "chrome/browser/first_run/upgrade_util_win.h"
 #endif
 
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+#include "chrome/browser/first_run/upgrade_util.h"
+#endif
+
 #if defined(ENABLE_RLZ)
 #include "components/rlz/rlz_tracker.h"
 #endif
@@ -246,7 +249,7 @@ void ShutdownPostThreadsStop(bool restart_last_session) {
 
 #if defined(OS_WIN)
     upgrade_util::RelaunchChromeWithMode(*new_cl.get(), g_relaunch_mode);
-#else
+#elif defined(OS_LINUX)

[gab, 2015/09/30 14:39:43]

Should this be OS_POSIX? Otherwise Mac isn't covered.

[Lei Zhang, 2015/09/30 23:33:55]

Good point. Thanks for catching that. I think this needs to be POSIX minus
ANDROID. I worry that all the trybots passed. @_@

     upgrade_util::RelaunchChromeBrowser(*new_cl.get());
 #endif  // defined(OS_WIN)