Refactor of ExtensionNavigationThrottle

chrome/browser/extensions/extension_browsertest.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/extensions/extension_browsertest.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 30 matching lines @@
 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/sync/model/string_ordinal.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_dialog_auto_confirm.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/test_extension_registry_observer.h"
@@ skipping 472 matching lines @@
 void ExtensionBrowserTest::EnableExtension(const std::string& extension_id) {
   ExtensionService* service = extensions::ExtensionSystem::Get(
       profile())->extension_service();
   service->EnableExtension(extension_id);
 }
 
 void ExtensionBrowserTest::OpenWindow(content::WebContents* contents,
                                       const GURL& url,
                                       bool newtab_process_should_equal_opener,
                                       content::WebContents** newtab_result) {
-  content::WindowedNotificationObserver windowed_observer(
-      content::NOTIFICATION_LOAD_STOP,
-      content::NotificationService::AllSources());
+  content::WebContentsAddedObserver tab_added_observer;
   ASSERT_TRUE(content::ExecuteScript(contents,
                                      "window.open('" + url.spec() + "');"));
-
-  // The above window.open call is not user-initiated, so it will create
-  // a popup window instead of a new tab in current window.
-  // The stop notification will come from the new tab.
-  windowed_observer.Wait();
-  content::NavigationController* controller =
-      content::Source<content::NavigationController>(
-          windowed_observer.source()).ptr();
-  content::WebContents* newtab = controller->GetWebContents();
+  content::WebContents* newtab = tab_added_observer.GetWebContents();
   ASSERT_TRUE(newtab);
-  EXPECT_EQ(url, controller->GetLastCommittedEntry()->GetURL());
-  if (newtab_process_should_equal_opener)
-    EXPECT_EQ(contents->GetRenderProcessHost(), newtab->GetRenderProcessHost());
-  else
-    EXPECT_NE(contents->GetRenderProcessHost(), newtab->GetRenderProcessHost());
+  WaitForLoadStop(newtab);
+  EXPECT_EQ(url, newtab->GetLastCommittedURL());
+  if (newtab_process_should_equal_opener) {
+    EXPECT_EQ(contents->GetMainFrame()->GetSiteInstance(),
+              newtab->GetMainFrame()->GetSiteInstance());
+  } else {
+    EXPECT_NE(contents->GetMainFrame()->GetSiteInstance(),
+              newtab->GetMainFrame()->GetSiteInstance());
+  }
 
   if (newtab_result)
     *newtab_result = newtab;
 }
 
 void ExtensionBrowserTest::NavigateInRenderer(content::WebContents* contents,
                                               const GURL& url) {
   // Ensure any existing navigations complete before trying to navigate anew, to
   // avoid triggering of the unload event for the wrong navigation.
   content::WaitForLoadStop(contents);
@@ skipping 36 matching lines @@
   return extensions::browsertest_util::ExecuteScriptInBackgroundPage(
       profile(), extension_id, script);
 }
 
 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait(
     const std::string& extension_id,
     const std::string& script) {
   return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait(
       profile(), extension_id, script);
 }