Another attempt at fixing dead frames being tracked by webNavigation

chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index 1b4cfb7a4335f728fc6fb79c1dd45cf43c230f60..117ae3bb771761d21ed7d032f5a53ea31862b2c1 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -2,23 +2,41 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <list>
+#include <set>
+
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "base/utf_string_conversions.h"
+#include "base/stringprintf.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_browser_main.h"
+#include "chrome/browser/chrome_browser_main_extra_parts.h"
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/resource_controller.h"
+#include "content/public/browser/resource_dispatcher_host.h"
+#include "content/public/browser/resource_throttle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+#include "webkit/glue/resource_type.h"
 
 using content::WebContents;
 
@@ -26,6 +44,7 @@ namespace extensions {
 
 namespace {
 
+// An UI-less RenderViewContextMenu.
 class TestRenderViewContextMenu : public RenderViewContextMenu {
  public:
   TestRenderViewContextMenu(WebContents* web_contents,
@@ -44,130 +63,380 @@ class TestRenderViewContextMenu : public RenderViewContextMenu {
   DISALLOW_COPY_AND_ASSIGN(TestRenderViewContextMenu);
 };
 
+
+// This class can defer requests for arbitrary URLs.
+class TestNavigationListener
+    : public base::RefCountedThreadSafe<TestNavigationListener> {
+ public:
+  TestNavigationListener() {}
+
+  // Add |url| to the set of URLs we should delay.
+  void DelayRequestsForURL(const GURL& url) {
+    if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
+      content::BrowserThread::PostTask(
+          content::BrowserThread::IO,
+          FROM_HERE,
+          base::Bind(&TestNavigationListener::DelayRequestsForURL, this, url));
+      return;
+    }
+    urls_to_delay_.insert(url);
+  }
+
+  // Resume all deferred requests.
+  void ResumeAll() {
+    if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
+      content::BrowserThread::PostTask(
+          content::BrowserThread::IO,
+          FROM_HERE,
+          base::Bind(&TestNavigationListener::ResumeAll, this));
+      return;
+    }
+    WeakThrottleList::const_iterator it;
+    for (it = throttles_.begin(); it != throttles_.end(); ++it) {
+      if (*it)
+        (*it)->Resume();
+    }
+    throttles_.clear();
+  }
+
+  // Constructs a ResourceThrottle if the request for |url| should be held.
+  //
+  // Needs to be invoked on the IO thread.
+  content::ResourceThrottle* CreateResourceThrottle(
+      const GURL& url,
+      ResourceType::Type resource_type) {
+    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    if (urls_to_delay_.find(url) == urls_to_delay_.end())
+      return NULL;
+
+    Throttle* throttle = new Throttle();
+    throttles_.push_back(throttle->AsWeakPtr());
+    return throttle;
+  }
+
+ private:
+  friend class base::RefCountedThreadSafe<TestNavigationListener>;
+
+  virtual ~TestNavigationListener() {}
+
+  // Stores a throttle per URL request that we have delayed.
+  class Throttle : public content::ResourceThrottle,
+                   public base::SupportsWeakPtr<Throttle> {
+   public:
+    void Resume() {
+      controller()->Resume();
+    }
+
+    // content::ResourceThrottle implementation.
+    virtual void WillStartRequest(bool* defer) {
+      *defer = true;
+    }
+  };
+  typedef base::WeakPtr<Throttle> WeakThrottle;
+  typedef std::list<WeakThrottle> WeakThrottleList;
+  WeakThrottleList throttles_;
+
+  // The set of URLs to be delayed.
+  std::set<GURL> urls_to_delay_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestNavigationListener);
+};
+
+// Waits for a WC to be created. Once it starts loading |delay_url| (after at
+// least the first navigation has committed), it delays the load, executes
+// |script| in the last committed RVH and resumes the load when |until_url|
+// commits. The idea is that |script| triggers the load of |until_url|.

[Charlie Reis, 2012/08/07 21:53:05]

nit: s/The idea is that |script| triggers/This class expects |script| to
trigger/.

[jochen (gone - plz use gerrit), 2012/08/08 08:31:51]

Done.

+class DelayLoadStartAndExecuteJavascript
+    : public content::NotificationObserver,
+      public content::WebContentsObserver {
+ public:
+  DelayLoadStartAndExecuteJavascript(
+      TestNavigationListener* test_navigation_listener,
+      const GURL& delay_url,
+      const std::string& script,
+      const GURL& until_url)
+      : content::WebContentsObserver(),
+        test_navigation_listener_(test_navigation_listener),
+        delay_url_(delay_url),
+        until_url_(until_url),
+        script_(script),
+        script_was_executed_(false),
+        rvh_(NULL) {
+    registrar_.Add(this,
+                   chrome::NOTIFICATION_TAB_ADDED,
+                   content::NotificationService::AllSources());
+    test_navigation_listener_->DelayRequestsForURL(delay_url_);
+  }
+  virtual ~DelayLoadStartAndExecuteJavascript() {}
+
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE {
+    if (type != chrome::NOTIFICATION_TAB_ADDED) {
+      NOTREACHED();
+      return;
+    }
+    content::WebContentsObserver::Observe(
+        content::Details<content::WebContents>(details).ptr());
+    registrar_.RemoveAll();
+  }
+
+  virtual void DidStartProvisionalLoadForFrame(
+      int64 frame_id,
+      bool is_main_frame,
+      const GURL& validated_url,
+      bool is_error_page,
+      content::RenderViewHost* render_view_host) OVERRIDE {
+    if (validated_url != delay_url_ || !rvh_)
+      return;
+
+    rvh_->ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script_));
+    script_was_executed_ = true;
+  }
+
+  virtual void DidCommitProvisionalLoadForFrame(
+      int64 frame_id,
+      bool is_main_frame,
+      const GURL& url,
+      content::PageTransition transition_type,
+      content::RenderViewHost* render_view_host) OVERRIDE {
+    if (script_was_executed_ && url == until_url_) {
+      content::WebContentsObserver::Observe(NULL);
+      test_navigation_listener_->ResumeAll();
+    }
+    rvh_ = render_view_host;
+  }
+
+ private:
+  content::NotificationRegistrar registrar_;
+
+  scoped_refptr<TestNavigationListener> test_navigation_listener_;
+
+  GURL delay_url_;
+  GURL until_url_;
+  std::string script_;
+  bool script_was_executed_;
+  content::RenderViewHost* rvh_;
+
+  DISALLOW_COPY_AND_ASSIGN(DelayLoadStartAndExecuteJavascript);
+};
+
+// A ResourceDispatcherHostDelegate that adds a TestNavigationObserver.
+class TestResourceDispatcherHostDelegate
+    : public ChromeResourceDispatcherHostDelegate {
+ public:
+  TestResourceDispatcherHostDelegate(
+      prerender::PrerenderTracker* prerender_tracker,
+      TestNavigationListener* test_navigation_listener)
+      : ChromeResourceDispatcherHostDelegate(prerender_tracker),
+        test_navigation_listener_(test_navigation_listener) {
+  }
+  virtual ~TestResourceDispatcherHostDelegate() {}
+
+  virtual void RequestBeginning(
+      net::URLRequest* request,
+      content::ResourceContext* resource_context,
+      ResourceType::Type resource_type,
+      int child_id,
+      int route_id,
+      bool is_continuation_of_transferred_request,
+      ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE {
+    ChromeResourceDispatcherHostDelegate::RequestBeginning(
+        request,
+        resource_context,
+        resource_type,
+        child_id,
+        route_id,
+        is_continuation_of_transferred_request,
+        throttles);
+    content::ResourceThrottle* throttle =
+        test_navigation_listener_->CreateResourceThrottle(request->url(),
+                                                          resource_type);
+    if (throttle)
+      throttles->push_back(throttle);
+  }
+
+ private:
+  scoped_refptr<TestNavigationListener> test_navigation_listener_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestResourceDispatcherHostDelegate);
+};
+
+// Used to manage the lifetime of the TestResourceDispatcherHostDelegate which
+// needs to be deleted before the threads are stopped.
+class TestBrowserMainExtraParts : public ChromeBrowserMainExtraParts {
+ public:
+  explicit TestBrowserMainExtraParts(
+      TestNavigationListener* test_navigation_listener)
+      : test_navigation_listener_(test_navigation_listener) {
+  }
+  virtual ~TestBrowserMainExtraParts() {}
+
+  TestResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() {
+    if (!resource_dispatcher_host_delegate_.get()) {
+      resource_dispatcher_host_delegate_.reset(
+          new TestResourceDispatcherHostDelegate(
+              g_browser_process->prerender_tracker(),
+              test_navigation_listener_.get()));
+    }
+    return resource_dispatcher_host_delegate_.get();
+  }
+
+  // ChromeBrowserMainExtraParts implementation.
+  virtual void PostMainMessageLoopRun() OVERRIDE {
+    resource_dispatcher_host_delegate_.reset();
+  }
+
+ private:
+  scoped_refptr<TestNavigationListener> test_navigation_listener_;
+  scoped_ptr<TestResourceDispatcherHostDelegate>
+      resource_dispatcher_host_delegate_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestBrowserMainExtraParts);
+};
+
+// A ContentBrowserClient that doesn't forward the RDH created signal.
+class TestContentBrowserClient : public chrome::ChromeContentBrowserClient {
+ public:
+  explicit TestContentBrowserClient(
+      TestNavigationListener* test_navigation_listener)
+      : chrome::ChromeContentBrowserClient(),

[jam, 2012/08/07 20:31:32]

nit: why?

[jochen (gone - plz use gerrit), 2012/08/08 08:31:51]

Done.

+        test_navigation_listener_(test_navigation_listener) {
+  }
+  virtual ~TestContentBrowserClient() {}
+
+  virtual void ResourceDispatcherHostCreated() OVERRIDE {
+    // Don't invoke ChromeContentBrowserClient::ResourceDispatcherHostCreated.
+    // It would notify BrowserProcessImpl which would create a CRDHD and other

[jam, 2012/08/07 20:31:32]

nit: ChromeResourceDispatcherHostDelegate since not everyone would know the
acronym

[jochen (gone - plz use gerrit), 2012/08/08 08:31:51]

Done.

+    // objects. Not creating other objects might turn out to be a problem in the
+    // future.
+    content::ResourceDispatcherHost::Get()->SetDelegate(
+        browser_main_extra_parts_->resource_dispatcher_host_delegate());
+  }
+
+  virtual content::BrowserMainParts* CreateBrowserMainParts(
+      const content::MainFunctionParams& parameters) OVERRIDE {
+    ChromeBrowserMainParts* main_parts = static_cast<ChromeBrowserMainParts*>(
+        ChromeContentBrowserClient::CreateBrowserMainParts(parameters));
+
+    browser_main_extra_parts_ =
+        new TestBrowserMainExtraParts(test_navigation_listener_.get());
+    main_parts->AddParts(browser_main_extra_parts_);
+    return main_parts;
+  }
+
+ private:
+  scoped_refptr<TestNavigationListener> test_navigation_listener_;
+  TestBrowserMainExtraParts* browser_main_extra_parts_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestContentBrowserClient);
+};
+
 }  // namespace
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigation) {
-  FrameNavigationState::set_allow_extension_scheme(true);
+class WebNavigationApiTest : public ExtensionApiTest {
+ public:
+  WebNavigationApiTest() {}
+  virtual ~WebNavigationApiTest() {}
+
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    ExtensionApiTest::SetUpInProcessBrowserTestFixture();
+
+    test_navigation_listener_ = new TestNavigationListener();
+    content_browser_client_.reset(
+        new TestContentBrowserClient(test_navigation_listener_.get()));
+    original_content_browser_client_ = content::GetContentClient()->browser();
+    content::GetContentClient()->set_browser_for_testing(
+        content_browser_client_.get());
+
+    FrameNavigationState::set_allow_extension_scheme(true);
+
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kAllowLegacyExtensionManifests);
+
+    host_resolver()->AddRule("*", "127.0.0.1");
+    ASSERT_TRUE(StartTestServer());
+  }
+
+  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
+    ExtensionApiTest::TearDownInProcessBrowserTestFixture();
+    content::GetContentClient()->set_browser_for_testing(
+        original_content_browser_client_);
+    content_browser_client_.reset();
+  }
 
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
+  TestNavigationListener* test_navigation_listener() {
+    return test_navigation_listener_.get();
+  }
 
+ private:
+  scoped_refptr<TestNavigationListener> test_navigation_listener_;
+  scoped_ptr<TestContentBrowserClient> content_browser_client_;
+  content::ContentBrowserClient* original_content_browser_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebNavigationApiTest);
+};
+
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Api) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_api.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationGetFrame) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, GetFrame) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_getFrame.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationClientRedirect) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ClientRedirect) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_clientRedirect.html"))
           << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationServerRedirect) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-  host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(StartTestServer());
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ServerRedirect) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_serverRedirect.html"))
           << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationForwardBack) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ForwardBack) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_forwardBack.html"))
           << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationIFrame) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, IFrame) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_iframe.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationOpenTab) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, OpenTab) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_openTab.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationReferenceFragment) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ReferenceFragment) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_referenceFragment.html"))
           << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationSimpleLoad) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, SimpleLoad) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_simpleLoad.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Failures) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_failures.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFilteredTest) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, FilteredTest) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_filtered.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, UserAction) {
   // Wait for the extension to set itself up and return control to us.
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_userAction.html")) << message_;
@@ -200,12 +469,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) {
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationRequestOpenTab) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, RequestOpenTab) {
   // Wait for the extension to set itself up and return control to us.
   ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_requestOpenTab.html"))
       << message_;
@@ -236,13 +500,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationRequestOpenTab) {
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationTargetBlank) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-  ASSERT_TRUE(StartTestServer());
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlank) {
   // Wait for the extension to set itself up and return control to us.
   ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_targetBlank.html"))
       << message_;
@@ -273,13 +531,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationTargetBlank) {
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationTargetBlankIncognito) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-  ASSERT_TRUE(StartTestServer());
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlankIncognito) {
   // Wait for the extension to set itself up and return control to us.
   ASSERT_TRUE(RunExtensionSubtest(
       "webnavigation", "test_targetBlank.html",
@@ -309,15 +561,69 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationTargetBlankIncognito) {
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationHistory) {
-  FrameNavigationState::set_allow_extension_scheme(true);
-
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowLegacyExtensionManifests);
-
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_history.html"))
           << message_;
 }
 
+IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcess) {
+  LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app"));
+  LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
+
+  ExtensionService* service = browser()->profile()->GetExtensionService();
+  const extensions::Extension* extension =
+      service->GetExtensionById(last_loaded_extension_id_, false);
+
+  // See crossProcess/d.html.
+  DelayLoadStartAndExecuteJavascript call_script(
+      test_navigation_listener(),
+      test_server()->GetURL("test1"),
+      "navigate2()",
+      extension->GetResourceURL("crossProcess/empty.html"));
+
+  // See crossProcess/e.html.
+  DelayLoadStartAndExecuteJavascript call_script2(
+      test_navigation_listener(),
+      test_server()->GetURL("test2"),
+      "updateHistory()",
+      extension->GetResourceURL("crossProcess/empty.html"));
+
+  // See crossProcess/f.html.
+  DelayLoadStartAndExecuteJavascript call_script3(
+      test_navigation_listener(),
+      test_server()->GetURL("test3"),
+      "updateFragment()",
+      extension->GetResourceURL(base::StringPrintf(
+          "crossProcess/f.html?%d#foo",
+          test_server()->host_port_pair().port())));
+
+  // See crossProcess/g.html.
+  DelayLoadStartAndExecuteJavascript call_script4(
+      test_navigation_listener(),
+      test_server()->GetURL("test4"),
+      "updateFragment()",
+      extension->GetResourceURL(base::StringPrintf(
+          "crossProcess/g.html?%d#foo",
+          test_server()->host_port_pair().port())));
+
+  // See crossProcess/h.html.
+  DelayLoadStartAndExecuteJavascript call_script5(
+      test_navigation_listener(),
+      test_server()->GetURL("test5"),
+      "updateHistory()",
+      extension->GetResourceURL("crossProcess/empty.html"));
+
+  // See crossProcess/i.html.
+  DelayLoadStartAndExecuteJavascript call_script6(
+      test_navigation_listener(),
+      test_server()->GetURL("test6"),
+      "updateHistory()",
+      extension->GetResourceURL("crossProcess/empty.html"));
+
+  ASSERT_TRUE(RunPageTest(
+      extension->GetResourceURL("test_crossProcess.html").spec()))
+          << message_;
+}
+
 }  // namespace extensions