Remove SWIGged use of BrowserProxy and TabProxy from PyAuto tests.

chrome/browser/automation/automation_provider_observers.cc

 // Copyright (c) 2012 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_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 235 matching lines @@
   }
 }
 
 NavigationControllerRestoredObserver::~NavigationControllerRestoredObserver() {
 }
 
 void NavigationControllerRestoredObserver::Observe(
     int type, const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (FinishedRestoring()) {
+    registrar_.RemoveAll();
     SendDone();
-    registrar_.RemoveAll();
   }
 }
 
 bool NavigationControllerRestoredObserver::FinishedRestoring() {
   return (!controller_->NeedsReload() && !controller_->GetPendingEntry() &&
           !controller_->GetWebContents()->IsLoading());
 }
 
 void NavigationControllerRestoredObserver::SendDone() {
-  if (!automation_)
-    return;
-
-  AutomationMsg_WaitForTabToBeRestored::WriteReplyParams(reply_message_.get(),
-                                                         true);
-  automation_->Send(reply_message_.release());
+  if (automation_) {
+    AutomationJSONReply(automation_, reply_message_.release())
+        .SendSuccess(NULL);
+  }
+  delete this;
 }
 
 NavigationNotificationObserver::NavigationNotificationObserver(
     NavigationController* controller,
     AutomationProvider* automation,
     IPC::Message* reply_message,
     int number_of_navigations,
     bool include_current_navigation,
     bool use_json_interface)
     : automation_(automation->AsWeakPtr()),
@@ skipping 2871 matching lines @@
       if (automation_) {
         AutomationJSONReply(automation_, reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }