Restart named testing channel on disconnect.

chrome/browser/automation/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/automation_provider.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
@@ skipping 92 matching lines @@
 
 #if defined(OS_WIN)
 #include "chrome/browser/external_tab_container_win.h"
 #endif  // defined(OS_WIN)
 
 using base::Time;
 
 AutomationProvider::AutomationProvider(Profile* profile)
     : profile_(profile),
       reply_message_(NULL),
+      reconnect_on_channel_error_(false),
       is_connected_(false),
       initial_loads_complete_(false) {
   TRACE_EVENT_BEGIN("AutomationProvider::AutomationProvider", 0, "");
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   browser_tracker_.reset(new AutomationBrowserTracker(this));
   extension_tracker_.reset(new AutomationExtensionTracker(this));
   tab_tracker_.reset(new AutomationTabTracker(this));
   window_tracker_.reset(new AutomationWindowTracker(this));
@@ skipping 16 matching lines @@
 
   if (channel_.get())
     channel_->Close();
 
   g_browser_process->ReleaseModule();
 }
 
 bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
   TRACE_EVENT_BEGIN("AutomationProvider::InitializeChannel", 0, "");
 
+  channel_id_ = channel_id;
   std::string effective_channel_id = channel_id;
 
   // If the channel_id starts with kNamedInterfacePrefix, create a named IPC
   // server and listen on it, else connect as client to an existing IPC server
   bool use_named_interface =
       channel_id.find(automation::kNamedInterfacePrefix) == 0;
   if (use_named_interface) {
     effective_channel_id = channel_id.substr(
         strlen(automation::kNamedInterfacePrefix));
     if (effective_channel_id.length() <= 0)
       return false;
+
+    reconnect_on_channel_error_ = true;
   }
 
   if (!automation_resource_message_filter_.get()) {
     automation_resource_message_filter_ = new AutomationResourceMessageFilter;
   }
 
   channel_.reset(new IPC::SyncChannel(
       effective_channel_id,
       use_named_interface ? IPC::Channel::MODE_NAMED_SERVER
                           : IPC::Channel::MODE_CLIENT,
@@ skipping 255 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(InvokeTaskLaterTask);
 };
 
 void AutomationProvider::HandleUnused(const IPC::Message& message, int handle) {
   if (window_tracker_->ContainsHandle(handle)) {
     window_tracker_->Remove(window_tracker_->GetResource(handle));
   }
 }
 
+bool AutomationProvider::ReinitializeChannel() {
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+
+  // Make sure any old channels are cleaned up before starting up a new one.
+  channel_.reset();
+  return InitializeChannel(channel_id_);
+}
+
 void AutomationProvider::OnChannelError() {
-  VLOG(1) << "AutomationProxy went away, shutting down app.";
-  AutomationProviderList::GetInstance()->RemoveProvider(this);
+  if (reconnect_on_channel_error_) {
+    VLOG(1) << "AutomationProxy disconnected, resetting AutomationProvider.";
+    if (!ReinitializeChannel()) {
+      VLOG(1) << "Error reinitializing AutomationProvider channel.";
+      AutomationProviderList::GetInstance()->RemoveProvider(this);
+    }
+  } else {
+    VLOG(1) << "AutomationProxy went away, shutting down app.";
+    AutomationProviderList::GetInstance()->RemoveProvider(this);

[Nirnimesh, 2011/02/17 00:55:12]

You won't need to repeat this RemoveProvider() call on line 452 and here again
if you invert the nature of the conditional above and and return early.

[dtu, 2011/02/17 02:14:25]

Done.

+  }
 }
 
 bool AutomationProvider::Send(IPC::Message* msg) {
   DCHECK(channel_.get());
   return channel_->Send(msg);
 }
 
 Browser* AutomationProvider::FindAndActivateTab(
     NavigationController* controller) {
   int tab_index;
@@ skipping 544 matching lines @@
     }
   }
 }
 
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   TabContents* tab_contents = GetTabContentsForHandle(tab_handle, &tab);
   if (tab_contents)
     tab_contents->OnSavePage();
 }