[Extensions] Re-enable some tab capture tests.

These tests were disabled for various reasons, but passed 3000
iterations on bots for all platforms.

Note that sub-tests that checked for permissions failures were
removed, since the <all_urls> permission is now needed for this
API, and that was added to the manifest for other tests that
weren't disabled.

Bug: 80212, 117927, 367695
Change-Id: I074f78626cac1fa4c8be6e020ea77b7e8ca3d65c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2267929Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: David Bertoni <dbertoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784236}

chrome/browser/extensions/extension_tabs_apitest.cc

@@ -152,29 +152,22 @@ class ExtensionApiCaptureTest : public ExtensionApiTabTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest,
-                       DISABLED_CaptureVisibleTabJpeg) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, CaptureVisibleTabJpeg) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
                                   "test_jpeg.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, DISABLED_CaptureVisibleTabPng) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, CaptureVisibleTabPng) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
                                   "test_png.html")) << message_;
 }
 
-// Times out on non-Windows.
-// See http://crbug.com/80212
-IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest,
-                       DISABLED_CaptureVisibleTabRace) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, CaptureVisibleTabRace) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
                                   "test_race.html")) << message_;
 }
 
-
-// Disabled for being flaky, see http://crbug/367695.
-IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest,
-                       DISABLED_CaptureVisibleFile) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, CaptureVisibleFile) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
                                   "test_file.html")) << message_;
 }

chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_jpeg.js

@@ -77,21 +77,6 @@ chrome.test.getConfig(function(config) {
       }));
     },
 
-    function captureVisibleTabNoPermissions() {
-      var fail_url = fixPort(kURLBaseB + 'black.html');
-      createWindow([fail_url], kWindowRect, pass(function(winId, tabIds) {
-        waitForAllTabs(pass(function() {
-          chrome.tabs.getSelected(winId, pass(function(tab) {
-            assertEq('complete', tab.status);  // waitForAllTabs ensures this.
-            chrome.tabs.captureVisibleTab(winId, fail(
-              'Cannot access contents of url "' + fail_url +
-              '". Extension manifest must request permission ' +
-              'to access this host.'));
-          }));
-        }));
-      }));
-    },
-
     function captureVisibleTabChromeExtensionScheme() {
       var url = chrome.extension.getURL("/common/white.html");
       createWindow([url], kWindowRect, pass(function(winId, tabIds) {

chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_png.js

@@ -93,21 +93,6 @@ chrome.test.getConfig(function(config) {
       }));
     },
 
-    function captureVisibleTabNoPermissions() {
-      var fail_url = fixPort(kURLBaseB + 'text.html');
-      createWindow([fail_url], kWindowRect, pass(function(winId, tabIds) {
-        waitForAllTabs(pass(function() {
-          chrome.tabs.getSelected(winId, pass(function(tab) {
-            assertEq('complete', tab.status);  // waitForAllTabs ensures this.
-            chrome.tabs.captureVisibleTab(winId, {'format': 'png'}, fail(
-              'Cannot access contents of url "' + fail_url +
-              '". Extension manifest must request permission ' +
-              'to access this host.'));
-          }));
-        }));
-      }));
-    },
-
     function captureVisibleTabChromeExtensionScheme() {
       var url = chrome.extension.getURL("/common/white.html");
       createWindow([url], kWindowRect, pass(function(winId, tabIds) {