| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 61fd30900a99b4efb1a1fa67bb249eea2b2548a5..dd3dbded14c426bc28f09d656288cf2166c040ff 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -2315,7 +2315,7 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI(
|
| const GURL& url,
|
| bool private_api,
|
| const content::SocketPermissionRequest* params) {
|
| -#if defined(ENABLE_PLUGINS)
|
| +#if defined(ENABLE_EXTENSIONS)
|
| Profile* profile = Profile::FromBrowserContext(browser_context);
|
| const extensions::ExtensionSet* extension_set = NULL;
|
| if (profile) {
|
| @@ -2531,7 +2531,7 @@ ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
|
| bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
|
| content::BrowserContext* browser_context,
|
| const GURL& url) {
|
| -#if defined(ENABLE_PLUGINS)
|
| +#if defined(ENABLE_EXTENSIONS)
|
| Profile* profile = Profile::FromBrowserContext(browser_context);
|
| const extensions::ExtensionSet* extension_set = NULL;
|
| if (profile) {
|
| @@ -2553,7 +2553,7 @@ bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
|
| bool ChromeContentBrowserClient::IsPluginAllowedToUseDevChannelAPIs(
|
| content::BrowserContext* browser_context,
|
| const GURL& url) {
|
| -#if defined(ENABLE_PLUGINS)
|
| +#if defined(ENABLE_EXTENSIONS)
|
| // Allow access for tests.
|
| if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnablePepperTesting)) {
|
|
|