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

content/browser/browser_main_runner.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/public/browser/browser_main_runner.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 131 matching lines @@
       // The trace event has to stay between profiler creation and destruction.
       TRACE_EVENT0("shutdown", "BrowserMainRunner");
       g_exited_main_message_loop = true;
 
       main_loop_->ShutdownThreadsAndCleanUp();
 
       ui::ShutdownInputMethod();
   #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);
 
       is_shutdown_ = true;
     }
   }
 
  protected:
   // True if we have started to initialize the runner.
@@ skipping 10 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content