Don't run the pre and post handlers after chromedriver receives a termination request.

chrome/test/webdriver/webdriver_session.cc

 // Copyright (c) 2011 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/test/webdriver/webdriver_session.h"
 
 #include <sstream>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 49 matching lines @@
 Session::Options::~Options() {
 }
 
 Session::Session(const Options& options)
     : id_(GenerateRandomID()),
       current_target_(FrameId(0, FramePath())),
       thread_(id_.c_str()),
       async_script_timeout_(0),
       implicit_wait_(0),
       has_alert_prompt_text_(false),
+      terminated_(false),
       options_(options) {
   SessionManager::GetInstance()->Add(this);
 }
 
 Session::~Session() {
   SessionManager::GetInstance()->Remove(id_);
 }
 
 Error* Session::Init(const Automation::BrowserOptions& options) {
   if (!thread_.Start()) {
     delete this;
     return new Error(kUnknownError, "Cannot start session thread");
   }
 
   Error* error = NULL;
   RunSessionTask(NewRunnableMethod(
       this,
       &Session::InitOnSessionThread,
       options,
       &error));
   if (error)
     Terminate();
   return error;
 }
 
 Error* Session::BeforeExecuteCommand() {
+  if (terminated_)
+    return NULL;
   Error* error = AfterExecuteCommand();
   if (!error) {
     scoped_ptr<Error> switch_error(SwitchToTopFrameIfCurrentFrameInvalid());
     if (switch_error.get()) {
       std::string text;
       scoped_ptr<Error> alert_error(GetAlertMessage(&text));
       if (alert_error.get()) {
         // Only return a frame checking error if a modal dialog is not present.
         // TODO(kkania): This is ugly. Fix.
         return switch_error.release();
       }
     }
   }
   return error;
 }
 
 Error* Session::AfterExecuteCommand() {
+  if (terminated_)
+    return NULL;
   Error* error = NULL;
   if (!options_.load_async) {
     LOG(INFO) << "Waiting for the page to stop loading";
     error = WaitForAllTabsToStopLoading();
     LOG(INFO) << "Done waiting for the page to stop loading";
   }
   return error;
 }
 
 void Session::Terminate() {
+  terminated_ = true;
   RunSessionTask(NewRunnableMethod(
       this,
       &Session::TerminateOnSessionThread));
   delete this;
 }
 
 Error* Session::ExecuteScript(const FrameId& frame_id,
                               const std::string& script,
                               const ListValue* const args,
                               Value** value) {
@@ skipping 1297 matching lines @@
 Error* Session::GetAppCacheStatus(int* status) {
   return ExecuteScriptAndParse(
       current_target_,
       atoms::asString(atoms::GET_APPCACHE_STATUS),
       "getAppcacheStatus",
       new ListValue(),
       CreateDirectValueParser(status));
 }
 
 }  // namespace webdriver