Calling Shutdown() for Android content_browsertests. Removed webrtc test hack.

content/browser/browser_main_runner.cc

Index: content/browser/browser_main_runner.cc
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 16309dec8460af490e891e47ace869c483d258c5..c41fc9541c982949b4e338e4dead6a4005c91616 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -149,7 +149,12 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
   #if defined(OS_WIN)
       ole_initializer_.reset(NULL);
   #endif
-
+  #if defined(OS_ANDROID)
+      // Forcefully terminates the RunLoop inside MessagePumpForUI, ensuring
+      // proper shutdown for content_browsertests. Shutdown() is not used by
+      // the actual browser.
+      base::MessageLoop::current()->QuitNow();

[jam, 2014/06/13 17:14:01]

can we avoid putting the test-only code in this non test file?

could this call go in browser_test_base.cc where you changed the code? or does
it have to happen before line 158 below?

[Victor Starodub, 2014/06/17 00:53:04]

FYI: the code is not actually test-specific. It's just it was decided not do a
proper shutdown on Android in the browser.

Unfortunately, as you've noticed, it has to go between
'main_loop_->ShutdownThreadsAndCleanUp()' and 'main_loop_.reset()'.

+  #endif
       main_loop_.reset(NULL);
 
       notification_service_.reset(NULL);