Fix pyauto flakiness by waiting for notification that the renderer process'

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2010 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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/path_service.h"
+#include "base/process.h"
+#include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/automation/automation_autocomplete_edit_tracker.h"
@@ skipping 2102 matching lines @@
       &TestingAutomationProvider::GetNTPInfo;
   handler_map["MoveNTPMostVisitedThumbnail"] =
       &TestingAutomationProvider::MoveNTPMostVisitedThumbnail;
   handler_map["RemoveNTPMostVisitedThumbnail"] =
       &TestingAutomationProvider::RemoveNTPMostVisitedThumbnail;
   handler_map["UnpinNTPMostVisitedThumbnail"] =
       &TestingAutomationProvider::UnpinNTPMostVisitedThumbnail;
   handler_map["RestoreAllNTPMostVisitedThumbnails"] =
       &TestingAutomationProvider::RestoreAllNTPMostVisitedThumbnails;
 
+  handler_map["KillRendererProcess"] =
+      &TestingAutomationProvider::KillRendererProcess;
+
   if (handler_map.find(std::string(command)) != handler_map.end()) {
     (this->*handler_map[command])(browser, dict_value, reply_message);
   } else {
     std::string error_string = "Unknown command. Options: ";
     for (std::map<std::string, JsonHandler>::const_iterator it =
          handler_map.begin(); it != handler_map.end(); ++it) {
       error_string += it->first + ", ";
     }
     AutomationJSONReply(this, reply_message).SendError(error_string);
   }
@@ skipping 2225 matching lines @@
   AutomationJSONReply reply(this, reply_message);
   history::TopSites* top_sites = browser->profile()->GetTopSites();
   if (!top_sites) {
     reply.SendError("TopSites service is not initialized.");
     return;
   }
   top_sites->ClearBlacklistedURLs();
   reply.SendSuccess(NULL);
 }
 
+void TestingAutomationProvider::KillRendererProcess(
+    Browser* browser,
+    DictionaryValue* args,
+    IPC::Message* reply_message) {
+  int pid;
+  if (!args->GetInteger("pid", &pid)) {
+    AutomationJSONReply(this, reply_message).
+        SendError("'pid' key missing or invalid.");
+    return;
+  }
+  base::ProcessHandle process;
+  if (!base::OpenProcessHandle(static_cast<base::ProcessId>(pid), &process)) {
+    AutomationJSONReply(this, reply_message).SendError(base::StringPrintf(
+        "Failed to open process handle for pid %d", pid));
+    return;
+  }
+  new RendererProcessClosedObserver(this, reply_message);
+  base::KillProcess(process, 0, false);
+  base::CloseProcessHandle(process);
+}
+
 void TestingAutomationProvider::WaitForTabCountToBecome(
     int browser_handle,
     int target_tab_count,
     IPC::Message* reply_message) {
   if (!browser_tracker_->ContainsHandle(browser_handle)) {
     AutomationMsg_WaitForTabCountToBecome::WriteReplyParams(reply_message,
                                                             false);
     Send(reply_message);
     return;
   }
@@ skipping 125 matching lines @@
     // If you change this, update Observer for NotificationType::SESSION_END
     // below.
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &TestingAutomationProvider::OnRemoveProvider));
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }