media: Add BrowserCdmManagerProcessWatcher.

content/browser/loader/resource_dispatcher_host_browsertest.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 "base/memory/ref_counted.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 287 matching lines @@
 }
 
 // Tests that the onbeforeunload and onunload logic is short-circuited if the
 // old renderer is gone.  In that case, we don't want to wait for the old
 // renderer to run the handlers.
 // We need to disable this on Mac because the crash causes the OS CrashReporter
 // process to kick in to analyze the poor dead renderer.  Unfortunately, if the
 // app isn't stripped of debug symbols, this takes about five minutes to
 // complete and isn't conducive to quick turnarounds. As we don't currently
 // strip the app on the build bots, this is bad times.
-// Also disabled on Android (http://crbug.com/506188).
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(OS_MACOSX)
 #define MAYBE_CrossSiteAfterCrash DISABLED_CrossSiteAfterCrash
 #else
 #define MAYBE_CrossSiteAfterCrash CrossSiteAfterCrash
 #endif
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        MAYBE_CrossSiteAfterCrash) {
   // Make sure we have a live process before trying to kill it.
   NavigateToURL(shell(), GURL("about:blank"));
 
   // Cause the renderer to crash.
@@ skipping 197 matching lines @@
   NavigateToURLBlockUntilNavigationsComplete(
       shell(),
       embedded_test_server()->GetURL("/client_redirect.html"),
       2);
 
   EXPECT_TRUE(
       delegate.page_transition() & ui::PAGE_TRANSITION_CLIENT_REDIRECT);
 }
 
 }  // namespace content