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)
+      // This is a hack for terminating the RunLoop inside MessagePumpForUI,

[bulach, 2014/06/09 09:26:45]

nit: perhaps:

// Forcefully terminates the RunLoop inside MessagePumpForUI,
// ensuring proper shutdown in content_browsertests.
// Shutdown() is not used by actual browser.

[Victor Starodub, 2014/06/09 16:13:26]

Done.

+      // used to ensure proper shutdown in content_browsertests. Shutdown() is
+      // not used by the actual android browser.
+      base::MessageLoop::current()->QuitNow();
+  #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