Merge 114213 - Fixes for the kWasRestarted pref.

chrome/browser/automation/testing_automation_provider.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/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 460 matching lines @@
         handled = AutomationProvider::OnMessageReceived(message))
   IPC_END_MESSAGE_MAP_EX()
   if (!deserialize_success)
     OnMessageDeserializationFailure();
   return handled;
 }
 
 void TestingAutomationProvider::OnChannelError() {
   if (!reinitialize_on_channel_error_ &&
       browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID)
-    BrowserList::AttemptExit(false);
+    BrowserList::AttemptExit();
   AutomationProvider::OnChannelError();
 }
 
 void TestingAutomationProvider::CloseBrowser(int browser_handle,
                                              IPC::Message* reply_message) {
   if (!browser_tracker_->ContainsHandle(browser_handle))
     return;
 
   Browser* browser = browser_tracker_->GetResource(browser_handle);
   new BrowserClosedNotificationObserver(browser, this, reply_message);
@@ skipping 6154 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }