Revert 193992 "Lets try this again."

trunk/src/ash/ash.gyp

Index: trunk/src/ash/ash.gyp
===================================================================
--- trunk/src/ash/ash.gyp	(revision 194148)
+++ trunk/src/ash/ash.gyp	(working copy)
@@ -19,6 +19,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content',
         '../content/content.gyp:content_browser',
         '../ipc/ipc.gyp:ipc',
@@ -30,15 +31,14 @@
         '../ui/aura/aura.gyp:aura',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/compositor/compositor.gyp:compositor',
-        '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/oak/oak.gyp:oak',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/views.gyp:views',
+        '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
-        '../url/url.gyp:url',
         'ash_resources',
         'ash_wallpaper_resources',
       ],
@@ -582,13 +582,14 @@
         '../chrome/chrome_resources.gyp:packed_resources',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:test_support_content',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
         '../ui/aura/aura.gyp:aura_test_support',
+        '../ui/app_list/app_list.gyp:app_list',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/compositor/compositor.gyp:compositor_test_support',
         '../ui/message_center/message_center.gyp:message_center',
@@ -596,11 +597,10 @@
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_test_support',
         '../ui/views/views.gyp:views',
+        '../ui/views/views.gyp:views_test_support',
         '../ui/views/views.gyp:views_examples_with_content_lib',
-        '../ui/views/views.gyp:views_test_support',
         '../ui/views/views.gyp:views_with_content_test_support',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
-        '../url/url.gyp:url',
         'ash',
         'ash_resources',
         'ash_test_support',