Revert of Add support for escaped target names in isolate driver (4th try) (patchset #2 id:20001 of https://codereview.chromium.org/1221333013/)

Reason for revert:
Speculative revert: appreas to have broken the GPU mac builders.

http://build.chromium.org/p/chromium.webkit/builders/GPU%20Mac%2010.9%20%28Intel%29%20%28dbg%29/builds/11045 .. 11141

Original issue's description:
> Add support for escaped target names in isolate driver (4th try)
>
> Currently the isolate_driver.py which creates the dependency files
> used by the isolate system, does a simple split on all spaces when
> trying to identify targets.
>
> This can fail if the target name contains a space in the name. In
> ninja, spaces are escaped with a $-prefix. An example would be
> 'Content$ Shell$ Helper.app'.
>
> This CL adds support for such target names and ensures that they
> stay as one item. Doing this uncovered a few missing dependencies
> and a missing file in some .isolate-files for the component build
> on Mac.
>
> 1st try: https://codereview.chromium.org/970203003/
> 1st revert: https://codereview.chromium.org/985753002/
> 2nd try: https://codereview.chromium.org/1103793002/
> 2nd revert: https://codereview.chromium.org/1129493003/
> 3rd try: https://codereview.chromium.org/1130523003/
> 3rd revert: https://codereview.chromium.org/1131363003/
> BUG=462248
>
> Committed: https://crrev.com/c58992cc880b5bff5813276ee9d20a79be70b31f
> Cr-Commit-Position: refs/heads/master@{#338402}

TBR=thakis@chromium.org,vadimsh@chromium.org,nyquist@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=462248

Review URL: https://codereview.chromium.org/1227843004

Cr-Commit-Position: refs/heads/master@{#338497}

5 files changed, 1 insertions, 15 deletions

diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
index 8bb6d06..43bc605 100644
--- a/chrome/chrome.isolate
+++ b/chrome/chrome.isolate
@@ -73,13 +73,6 @@
         ],
       },
     }],
-    ['OS=="mac" and component=="shared_library"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/libchrome_main_dll.dylib',
-        ],
-      },
-    }],
     ['OS=="mac" and asan==1 and fastbuild==0', {
       'variables': {
         'files': [
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 7c28595..00e1932 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3178,7 +3178,6 @@
           'target_name': 'interactive_ui_tests_run',
           'type': 'none',
           'dependencies': [
-            'chrome',
             'interactive_ui_tests',
           ],
           'conditions': [
@@ -3199,7 +3198,6 @@
           'target_name': 'sync_integration_tests_run',
           'type': 'none',
           'dependencies': [
-            'chrome',
             'sync_integration_tests',
           ],
           'conditions': [
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index c6959fb..1a5c74b 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -142,6 +142,5 @@
   'includes': [
     '../base/base.isolate',
     '../gin/v8.isolate',
-    'chrome.isolate',
   ],
 }
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index ba6aa6f..0b22cf6 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -112,6 +112,5 @@
     '../base/base.isolate',
     '../gin/v8.isolate',
     '../third_party/angle/angle.isolate',
-    'chrome.isolate',
   ],
 }
diff --git a/tools/isolate_driver.py b/tools/isolate_driver.py
index f51b824..6c9f118 100755
--- a/tools/isolate_driver.py
+++ b/tools/isolate_driver.py
@@ -24,7 +24,6 @@ import json
 import logging
 import os
 import posixpath
-import re
 import StringIO
 import subprocess
 import sys
@@ -142,9 +141,7 @@ def raw_build_to_deps(item):
   # TODO(maruel): Use a whitelist instead? .stamp, .so.TOC, .dylib.TOC,
   # .dll.lib, .exe and empty.
   # The first item is the build rule, e.g. 'link', 'cxx', 'phony', etc.
-  # In ninja build files, spaces in targets are escaped with a $-prefix.
-  # Use a negative lookbehind to not split on '$ '.
-  return filter(using_blacklist, re.split('(?<!\$) ', item)[1:])
+  return filter(using_blacklist, item.split(' ')[1:])
 
 
 def collect_deps(target, build_steps, dependencies_added, rules_seen):