Commit bf09dc2b authored by Pavol Marko's avatar Pavol Marko Committed by Commit Bot

Revert "Introduce command-line switch to force-enable developer tools"

This reverts commit 8b20bfaf.

Reason for revert: This should only apply on Chrome OS, see follow-up CL:1141742 .

Original change's description:
> Introduce command-line switch to force-enable developer tools
> 
> Since CL:1125855, the new default is that policy-installed extensions
> can not be inspected by developer tools.
> However, some autotests rely on inspecting policy-installed extensions
> and it is infeasible to change the policy the device sees there.
> Introduce the "--force-devtools-available" command-line switch which
> enforces developer tools availability.
> 
> Bug: 838146
> Test: browser_tests --gtest_filter=*DevTools*
> Change-Id: I666d9785195eff53f1a1346d95177985d1573d72
> Reviewed-on: https://chromium-review.googlesource.com/1140308
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Commit-Queue: Pavol Marko <pmarko@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#575994}

TBR=dgozman@chromium.org,atwilson@chromium.org,pmarko@chromium.org,jochen@chromium.org

Change-Id: I8ca2b4920ebec5dbc811bdf05fbbf39afc94dc08
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 838146
Reviewed-on: https://chromium-review.googlesource.com/1142104Reviewed-by: default avatarPavol Marko <pmarko@chromium.org>
Commit-Queue: Pavol Marko <pmarko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576072}
parent 94218d2c
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include <utility> #include <utility>
#include "base/command_line.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/devtools/chrome_devtools_session.h" #include "chrome/browser/devtools/chrome_devtools_session.h"
...@@ -150,10 +149,6 @@ bool ChromeDevToolsManagerDelegate::AllowInspection( ...@@ -150,10 +149,6 @@ bool ChromeDevToolsManagerDelegate::AllowInspection(
bool ChromeDevToolsManagerDelegate::AllowInspection( bool ChromeDevToolsManagerDelegate::AllowInspection(
Profile* profile, Profile* profile,
const extensions::Extension* extension) { const extensions::Extension* extension) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kForceDevToolsAvailable))
return true;
using Availability = policy::DeveloperToolsPolicyHandler::Availability; using Availability = policy::DeveloperToolsPolicyHandler::Availability;
Availability availability = Availability availability =
policy::DeveloperToolsPolicyHandler::GetDevToolsAvailability( policy::DeveloperToolsPolicyHandler::GetDevToolsAvailability(
......
...@@ -1948,41 +1948,6 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityExtensionTest, ...@@ -1948,41 +1948,6 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityExtensionTest,
ASSERT_FALSE(DevToolsWindow::FindDevToolsWindow(agent_host.get())); ASSERT_FALSE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
} }
class DevToolsAllowedByCommandLineSwitch
: public extensions::ExtensionBrowserTest {
public:
void SetUpCommandLine(base::CommandLine* command_line) override {
extensions::ExtensionBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kForceDevToolsAvailable);
}
};
IN_PROC_BROWSER_TEST_F(DevToolsAllowedByCommandLineSwitch,
SwitchOverridesPolicy) {
browser()->profile()->GetPrefs()->SetInteger(
prefs::kDevToolsAvailability,
static_cast<int>(policy::DeveloperToolsPolicyHandler::Availability::
kDisallowedForForceInstalledExtensions));
base::FilePath crx_path;
base::PathService::Get(chrome::DIR_TEST_DATA, &crx_path);
crx_path = crx_path.AppendASCII("devtools")
.AppendASCII("extensions")
.AppendASCII("options.crx");
const Extension* extension = InstallExtension(
crx_path, 1, extensions::Manifest::EXTERNAL_POLICY_DOWNLOAD);
ASSERT_TRUE(extension);
GURL url("chrome-extension://" + extension->id() + "/options.html");
ui_test_utils::NavigateToURL(browser(), url);
content::WebContents* web_contents =
browser()->tab_strip_model()->GetWebContentsAt(0);
DevToolsWindow::OpenDevToolsWindow(web_contents);
auto agent_host = content::DevToolsAgentHost::GetOrCreateFor(web_contents);
ASSERT_TRUE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
}
class DevToolsPixelOutputTests : public DevToolsSanityTest { class DevToolsPixelOutputTests : public DevToolsSanityTest {
public: public:
void SetUpCommandLine(base::CommandLine* command_line) override { void SetUpCommandLine(base::CommandLine* command_line) override {
......
...@@ -377,10 +377,6 @@ const char kForceAppMode[] = "force-app-mode"; ...@@ -377,10 +377,6 @@ const char kForceAppMode[] = "force-app-mode";
// is triggered. // is triggered.
const char kForceDesktopIOSPromotion[] = "force-desktop-ios-promotion"; const char kForceDesktopIOSPromotion[] = "force-desktop-ios-promotion";
// Forces developer tools availability, no matter what values the enterprise
// policies DeveloperToolsDisabled and DeveloperToolsAvailability are set to.
const char kForceDevToolsAvailable[] = "force-devtools-available";
// Displays the First Run experience when the browser is started, regardless of // Displays the First Run experience when the browser is started, regardless of
// whether or not it's actually the First Run (this overrides kNoFirstRun). // whether or not it's actually the First Run (this overrides kNoFirstRun).
const char kForceFirstRun[] = "force-first-run"; const char kForceFirstRun[] = "force-first-run";
......
...@@ -119,7 +119,6 @@ extern const char kFastStart[]; ...@@ -119,7 +119,6 @@ extern const char kFastStart[];
extern const char kForceAndroidAppMode[]; extern const char kForceAndroidAppMode[];
extern const char kForceAppMode[]; extern const char kForceAppMode[];
extern const char kForceDesktopIOSPromotion[]; extern const char kForceDesktopIOSPromotion[];
extern const char kForceDevToolsAvailable[];
extern const char kForceFirstRun[]; extern const char kForceFirstRun[];
extern const char kForceFirstRunDialog[]; extern const char kForceFirstRunDialog[];
extern const char kForceLocalNtp[]; extern const char kForceLocalNtp[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment