Revert 107669 (Looks to have caused bot failures) - Register the RenderViewHost instance created ...

chrome/browser/external_tab_container_win.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/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 201 matching lines @@
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  content::Source<NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR,
                  content::Source<NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
                  content::Source<NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
                  content::Source<TabContents>(tab_contents_->tab_contents()));
   registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
                  content::NotificationService::AllSources());
-  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED,
-                 content::NotificationService::AllSources());
 
   TabContentsObserver::Observe(tab_contents_->tab_contents());
 
   // Start loading initial URL
   if (!initial_url.is_empty()) {
     // Navigate out of context since we don't have a 'tab_handle_' yet.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         external_method_factory_.NewRunnableMethod(
             &ExternalTabContainer::Navigate, initial_url, referrer));
@@ skipping 599 matching lines @@
         if (load != NULL &&
             content::PageTransitionIsMainFrame(load->origin())) {
           TRACE_EVENT_END_ETW("ExternalTabContainer::Navigate", 0,
                               load->url().spec());
           automation_->Send(new AutomationMsg_TabLoaded(tab_handle_,
                                                         load->url()));
         }
         break;
       }
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
-      if (ignore_next_load_notification_) {
-        ignore_next_load_notification_ = false;
-        return;
+        if (ignore_next_load_notification_) {
+          ignore_next_load_notification_ = false;
+          return;
+        }
+
+        const content::LoadCommittedDetails* commit =
+            content::Details<content::LoadCommittedDetails>(details).ptr();
+
+        if (commit->http_status_code >= kHttpClientErrorStart &&
+            commit->http_status_code <= kHttpServerErrorEnd) {
+          automation_->Send(new AutomationMsg_NavigationFailed(
+              tab_handle_, commit->http_status_code, commit->entry->url()));
+
+          ignore_next_load_notification_ = true;
+        } else {
+          NavigationInfo navigation_info;
+          // When the previous entry index is invalid, it will be -1, which
+          // will still make the computation come out right (navigating to the
+          // 0th entry will be +1).
+          if (InitNavigationInfo(&navigation_info, commit->type,
+                  commit->previous_entry_index -
+                  tab_contents_->controller().last_committed_entry_index()))
+            automation_->Send(new AutomationMsg_DidNavigate(tab_handle_,
+                                                            navigation_info));
+        }
+        break;
       }
-
-      const content::LoadCommittedDetails* commit =
-          content::Details<content::LoadCommittedDetails>(details).ptr();
-
-      if (commit->http_status_code >= kHttpClientErrorStart &&
-          commit->http_status_code <= kHttpServerErrorEnd) {
-        automation_->Send(new AutomationMsg_NavigationFailed(
-            tab_handle_, commit->http_status_code, commit->entry->url()));
-
-        ignore_next_load_notification_ = true;
-      } else {
-        NavigationInfo navigation_info;
-        // When the previous entry index is invalid, it will be -1, which
-        // will still make the computation come out right (navigating to the
-        // 0th entry will be +1).
-        if (InitNavigationInfo(&navigation_info, commit->type,
-                commit->previous_entry_index -
-                tab_contents_->controller().last_committed_entry_index()))
-          automation_->Send(new AutomationMsg_DidNavigate(tab_handle_,
-                                                          navigation_info));
-      }
-      break;
-    }
     case content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR: {
       const ProvisionalLoadDetails* load_details =
           content::Details<ProvisionalLoadDetails>(details).ptr();
       automation_->Send(new AutomationMsg_NavigationFailed(
           tab_handle_, load_details->error_code(), load_details->url()));
 
       ignore_next_load_notification_ = true;
       break;
     }
     case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB: {
       if (load_requests_via_automation_) {
         RenderViewHost* rvh = content::Details<RenderViewHost>(details).ptr();
         RegisterRenderViewHostForAutomation(rvh, false);
       }
       break;
     }
     case content::NOTIFICATION_RENDER_VIEW_HOST_DELETED: {
       if (load_requests_via_automation_) {
         RenderViewHost* rvh = content::Source<RenderViewHost>(source).ptr();
         UnregisterRenderViewHost(rvh);
       }
       break;
     }
-    case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED: {
-      if (load_requests_via_automation_) {
-        RenderViewHost* rvh = content::Source<RenderViewHost>(source).ptr();
-        RegisterRenderViewHostForAutomation(rvh, false);
-      }
-      break;
-    }
     default:
       NOTREACHED();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, views::NativeWidgetWin overrides:
 
 LRESULT ExternalTabContainer::OnCreate(LPCREATESTRUCT create_struct) {
   LRESULT result = views::NativeWidgetWin::OnCreate(create_struct);
@@ skipping 313 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   TabContents* new_contents =
       ExternalTabContainer::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }