summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/extensions/api/debugger
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/extensions/api/debugger
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/debugger')
-rw-r--r--chromium/chrome/browser/extensions/api/debugger/debugger_api.cc4
-rw-r--r--chromium/chrome/browser/extensions/api/debugger/debugger_apitest.cc20
2 files changed, 21 insertions, 3 deletions
diff --git a/chromium/chrome/browser/extensions/api/debugger/debugger_api.cc b/chromium/chrome/browser/extensions/api/debugger/debugger_api.cc
index 253ce751bd9..3aaf2863859 100644
--- a/chromium/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chromium/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -389,9 +389,7 @@ bool ExtensionDevToolsClientHost::MayWriteLocalFiles() {
// DebuggerFunction -----------------------------------------------------------
-DebuggerFunction::DebuggerFunction()
- : client_host_(NULL) {
-}
+DebuggerFunction::DebuggerFunction() : client_host_(nullptr) {}
DebuggerFunction::~DebuggerFunction() = default;
diff --git a/chromium/chrome/browser/extensions/api/debugger/debugger_apitest.cc b/chromium/chrome/browser/extensions/api/debugger/debugger_apitest.cc
index 704f95eed0c..71ce5a3399d 100644
--- a/chromium/chrome/browser/extensions/api/debugger/debugger_apitest.cc
+++ b/chromium/chrome/browser/extensions/api/debugger/debugger_apitest.cc
@@ -381,4 +381,24 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessDebuggerExtensionApiTest, Debugger) {
<< message_;
}
+IN_PROC_BROWSER_TEST_F(SitePerProcessDebuggerExtensionApiTest,
+ AutoAttachPermissions) {
+ GURL url(embedded_test_server()->GetURL(
+ "a.com",
+ "/extensions/api_test/debugger_auto_attach_permissions/page.html"));
+ ASSERT_TRUE(RunExtensionTestWithArg("debugger_auto_attach_permissions",
+ url.spec().c_str()))
+ << message_;
+}
+
+IN_PROC_BROWSER_TEST_F(SitePerProcessDebuggerExtensionApiTest,
+ NavigateSubframe) {
+ GURL url(embedded_test_server()->GetURL(
+ "a.com",
+ "/extensions/api_test/debugger_navigate_subframe/inspected_page.html"));
+ ASSERT_TRUE(
+ RunExtensionTestWithArg("debugger_navigate_subframe", url.spec().c_str()))
+ << message_;
+}
+
} // namespace extensions