chrome/browser/extensions/content_script_apitest.cc - Issue 1225413002: [Extensions] Fix improper extension tab ownership bug

Unified Diff: chrome/browser/extensions/content_script_apitest.cc

Issue 1225413002: [Extensions] Fix improper extension tab ownership bug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/extensions/content_script_apitest.cc

diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc

index ed60dcb7d1c2c41ac36ceccb64f4ccf2a73dc8a5..3f09251f8743173d6586fb97fb0a1da1051f3210 100644

--- a/chrome/browser/extensions/content_script_apitest.cc

+++ b/chrome/browser/extensions/content_script_apitest.cc

@@ -17,6 +17,7 @@

#include "components/app_modal/javascript_dialog_extensions_client.h"

#include "components/app_modal/javascript_dialog_manager.h"

#include "content/public/browser/javascript_dialog_manager.h"

+#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_delegate.h"

#include "content/public/test/browser_test_utils.h"

@@ -214,6 +215,17 @@ const char kBlockingScript[] = "alert('ALERT');";

// A (non-blocking) content script that sends a message.

const char kNonBlockingScript[] = "chrome.test.sendMessage('done');";

+const char kNewTabOverrideManifest[] =

+ "{"

+ " \"name\": \"New tab override\","

+ " \"version\": \"0.1\","

+ " \"manifest_version\": 2,"

+ " \"description\": \"Foo!\","

+ " \"chrome_url_overrides\": {\"newtab\": \"newtab.html\"}"

+ "}";

+const char kNewTabHtml[] = "<html>NewTabOverride!</html>";

} // namespace

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAllFrames) {

@@ -566,4 +578,41 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,

EXPECT_EQ(1u, dialog_helper.dialog_count());

}

+// Bug fix for crbug.com/507461.

+IN_PROC_BROWSER_TEST_F(ExtensionApiTest,

+ DocumentStartInjectionFromExtensionTabNavigation) {

+ ASSERT_TRUE(StartEmbeddedTestServer());

+ TestExtensionDir new_tab_override_dir;

+ new_tab_override_dir.WriteManifest(kNewTabOverrideManifest);

+ new_tab_override_dir.WriteFile(FILE_PATH_LITERAL("newtab.html"), kNewTabHtml);

+ const Extension* new_tab_override =

+ LoadExtension(new_tab_override_dir.unpacked_path());

+ ASSERT_TRUE(new_tab_override);

+ TestExtensionDir injector_dir;

+ injector_dir.WriteManifest(

+ base::StringPrintf(kManifest, "injector", "document_start"));

+ injector_dir.WriteFile(FILE_PATH_LITERAL("script.js"), kNonBlockingScript);

+ const Extension* injector = LoadExtension(injector_dir.unpacked_path());

+ ASSERT_TRUE(injector);

+ ExtensionTestMessageListener listener("done", false);

+ AddTabAtIndex(0, GURL("chrome://newtab"), ui::PAGE_TRANSITION_LINK);

+ browser()->tab_strip_model()->ActivateTabAt(0, false);

+ content::WebContents* tab_contents =

+ browser()->tab_strip_model()->GetActiveWebContents();

+ EXPECT_EQ(new_tab_override->GetResourceURL("newtab.html"),

+ tab_contents->GetMainFrame()->GetLastCommittedURL());

+ EXPECT_FALSE(listener.was_satisfied());

+ listener.Reset();

+ ui_test_utils::NavigateToURLWithDisposition(

+ browser(), embedded_test_server()->GetURL("/empty.html"),

+ CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);

+ base::RunLoop().RunUntilIdle();

+ EXPECT_TRUE(listener.was_satisfied());

} // namespace extensions

« no previous file with comments | « no previous file | extensions/browser/extension_web_contents_observer.cc » ('j') | no next file with comments »