Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

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

Issue 2924383003: [MD Bookmarks] Enable by default. (Closed)
Patch Set: rebase, address comments Created 3 years, 6 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/view_extension_source_browsertest.cc
diff --git a/chrome/browser/extensions/view_extension_source_browsertest.cc b/chrome/browser/extensions/view_extension_source_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4dbf31fa4fb5b32a1898666ad127ea80fbdb5303
--- /dev/null
+++ b/chrome/browser/extensions/view_extension_source_browsertest.cc
@@ -0,0 +1,95 @@
+// Copyright 2017 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/chrome_notification_types.h"
+#include "chrome/browser/extensions/extension_browsertest.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/url_constants.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/navigation_entry.h"
benwells 2017/06/22 01:55:20 Nit: I don't think this include is needed.
calamity 2017/06/22 04:24:49 This is GetActiveEntry()->GetVirtualURL().
benwells 2017/06/22 04:27:12 Acknowledged.
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
+#include "extensions/common/constants.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "url/gurl.h"
+
+typedef ExtensionBrowserTest ViewExtensionSourceTest;
+
+// Verify that restoring a view-source tab for a Chrome extension works
+// properly. See https://crbug.com/699428.
+IN_PROC_BROWSER_TEST_F(ViewExtensionSourceTest, ViewSourceTabRestore) {
+ ASSERT_TRUE(embedded_test_server()->Start());
+
+ LoadExtension(
+ test_data_dir_.AppendASCII("browsertest/url_rewrite/bookmarks"));
+
+ // Go to the Chrome bookmarks URL. It should redirect to the bookmark
+ // manager Chrome extension.
+ GURL bookmarks_url(chrome::kChromeUIBookmarksURL);
+ ui_test_utils::NavigateToURL(browser(), bookmarks_url);
+ EXPECT_TRUE(chrome::CanViewSource(browser()));
+ content::WebContents* bookmarks_tab =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ GURL bookmarks_extension_url =
+ bookmarks_tab->GetMainFrame()->GetLastCommittedURL();
+ EXPECT_TRUE(bookmarks_extension_url.SchemeIs(extensions::kExtensionScheme));
+
+ // Open a new view-source tab for that URL.
+ GURL view_source_url(content::kViewSourceScheme + std::string(":") +
+ bookmarks_extension_url.spec());
+ AddTabAtIndex(1, view_source_url, ui::PAGE_TRANSITION_TYPED);
+ content::WebContents* view_source_tab =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ EXPECT_EQ(view_source_url, view_source_tab->GetVisibleURL());
+ EXPECT_EQ(view_source_url,
+ view_source_tab->GetController().GetActiveEntry()->GetVirtualURL());
+ EXPECT_EQ(bookmarks_extension_url,
+ view_source_tab->GetMainFrame()->GetLastCommittedURL());
+ EXPECT_FALSE(chrome::CanViewSource(browser()));
+
+ // Close the view-source tab.
+ chrome::CloseTab(browser());
+ ASSERT_EQ(1, browser()->tab_strip_model()->count());
+
+ // Restore the tab. In the bug, the restored navigation was blocked, and we
+ // ended up showing view-source of an about:blank page.
+ content::WindowedNotificationObserver tab_added_observer(
+ chrome::NOTIFICATION_TAB_PARENTED,
+ content::NotificationService::AllSources());
+ chrome::RestoreTab(browser());
+ tab_added_observer.Wait();
+ view_source_tab = browser()->tab_strip_model()->GetActiveWebContents();
+ WaitForLoadStop(view_source_tab);
+
+ // Verify the browser-side URLs. Note that without view-source, the
+ // bookmarks extension visible URL would be rewritten to chrome://bookmarks,
+ // but with view-source, we should still see it as
+ // view-source:chrome-extension://.../.
+ EXPECT_EQ(view_source_url, view_source_tab->GetVisibleURL());
+ EXPECT_EQ(view_source_url,
+ view_source_tab->GetController().GetActiveEntry()->GetVirtualURL());
+ EXPECT_EQ(bookmarks_extension_url,
+ view_source_tab->GetMainFrame()->GetLastCommittedURL());
+ EXPECT_FALSE(chrome::CanViewSource(browser()));
+
+ // Verify that the view-source content is not empty, and that the
+ // renderer-side URL is correct.
+ int view_source_length;
+ EXPECT_TRUE(ExecuteScriptAndExtractInt(
+ view_source_tab,
+ "domAutomationController.send(document.body.innerText.length)",
+ &view_source_length));
+ EXPECT_GT(view_source_length, 0);
+
+ std::string location;
+ EXPECT_TRUE(ExecuteScriptAndExtractString(
+ view_source_tab, "domAutomationController.send(location.href)",
+ &location));
+ EXPECT_EQ(bookmarks_extension_url, location);
+}

Powered by Google App Engine
This is Rietveld 408576698