Revert "Fix flakiness in AutomationApiTest.DesktopHitTestIframe"

This reverts commit 2c1a1650.

Reason for revert: This is still flaking.

Original change's description:
> Fix flakiness in AutomationApiTest.DesktopHitTestIframe
> 
> At least one issue was that the loadComplete event was sometimes being
> received on a frame with an empty url.
> 
> Bug: 808343,622387
> Change-Id: I7040a75c91f409ba07d3b9ad4e4598805e94b6ce
> Reviewed-on: https://chromium-review.googlesource.com/938495
> Reviewed-by: David Tseng <dtseng@chromium.org>
> Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#540097}

TBR=dmazzoni@chromium.org,dtseng@chromium.org

Change-Id: If3a4f36c64d2a2d2be04d7d520082344edcc1290
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 808343, 622387
Reviewed-on: https://chromium-review.googlesource.com/944768Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#540356}

chrome/browser/extensions/api/automation/automation_apitest.cc

@@ -200,14 +200,16 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusWeb) {
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusIframe) {
+// TODO(https://crbug.com/622387): flaky.
+IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_DesktopFocusIframe) {
   StartEmbeddedTestServer();
   ASSERT_TRUE(
       RunExtensionSubtest("automation/tests/desktop", "focus_iframe.html"))
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopHitTestIframe) {
+// TODO(https://crbug.com/622387): flaky.
+IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_DesktopHitTestIframe) {
   StartEmbeddedTestServer();
   ASSERT_TRUE(
       RunExtensionSubtest("automation/tests/desktop", "hit_test_iframe.html"))

chrome/test/data/extensions/api_test/automation/tests/desktop/focus_iframe.js

@@ -18,8 +18,7 @@ var allTests = [
         // Wait for the inner frame to load, then find the button inside it
         // and focus it.
         rootNode.addEventListener('loadComplete', function(event) {
-          if (event.target.url &&
-              event.target.url.indexOf('iframe_inner.html') >= 0) {
+          if (event.target.url.indexOf('iframe_inner.html') >= 0) {
             chrome.automation.getFocus(function(focus) {
               // Assert that the outer frame has focus.
               assertTrue(focus.url.indexOf('iframe_outer') >= 0);

chrome/test/data/extensions/api_test/automation/tests/desktop/hit_test_iframe.js

@@ -18,8 +18,7 @@ var allTests = [
         // Wait for the inner frame to load, then find the button inside it
         // and do a hit test on it.
         rootNode.addEventListener(EventType.LOAD_COMPLETE, function(event) {
-          if (event.target.url &&
-              event.target.url.indexOf('iframe_inner.html') >= 0) {
+          if (event.target.url.indexOf('iframe_inner.html') >= 0) {
             // Find the inner button.
             var innerButton = event.target.find(
                 { attributes: { name: 'Inner' } });