Use StopChildProcess instead of base::KillProcess to kill a renderer process

content/browser/security_exploit_browsertest.cc

 // Copyright (c) 2013 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/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/frame_host/navigator.h"
@@ skipping 92 matching lines @@
     // create arbitrary SiteInstances.
     command_line->AppendSwitchASCII(
         switches::kHostResolverRules,
         "MAP * " +
             net::HostPortPair::FromURL(embedded_test_server()->base_url())
                 .ToString() +
             ",EXCLUDE localhost");
   }
 };
 
-// Fails because the process kill on Android does not succeed.
-// http://crbug.com/433068
-#if defined(OS_ANDROID)
-#define MAYBE_SetWebUIProperty DISABLED_SetWebUIProperty
-#else
-#define MAYBE_SetWebUIProperty SetWebUIProperty
-#endif
-
 // Ensure that we kill the renderer process if we try to give it WebUI
 // properties and it doesn't have enabled WebUI bindings.
-IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, MAYBE_SetWebUIProperty) {
+IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, SetWebUIProperty) {
   GURL foo("http://foo.com/simple_page.html");
 
   NavigateToURL(shell(), foo);
   EXPECT_EQ(base::ASCIIToUTF16("OK"), shell()->web_contents()->GetTitle());
   EXPECT_EQ(0,
       shell()->web_contents()->GetRenderViewHost()->GetEnabledBindings());
 
   content::RenderProcessHostWatcher terminated(
       shell()->web_contents(),
       content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
@@ skipping 141 matching lines @@
   // "evil" message doesn't arrive in the intervening period.
   ASSERT_TRUE(content::ExecuteScript(
       interstitial_page->GetRenderViewHostForTesting(),
       "window.domAutomationController.send(\"okay2\");"));
   ASSERT_TRUE(message_queue.WaitForMessage(&message));
   ASSERT_EQ("\"okay2\"", message);
   ASSERT_EQ("\"okay2\"", interstitial->last_command());
 }
 
 }  // namespace content