Revert 193992 "Lets try this again."

trunk/src/ash/ash.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
     'ash_resources.gypi',
   ],
   'targets': [
     {
       'target_name': 'ash',
       'type': '<(component)',
       'dependencies': [
         'ash_strings.gyp:ash_strings',
         '../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',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../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/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',
       ],
       'defines': [
         'ASH_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under ash, except unittests
         'accelerators/accelerator_controller.cc',
         'accelerators/accelerator_controller.h',
@@ skipping 523 matching lines @@
     {
       'target_name': 'ash_unittests',
       'type': 'executable',
       'dependencies': [
         'ash_strings.gyp:ash_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../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',
         '../ui/ui.gyp:ui',
         '../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',
       ],
       'sources': [
         '../ui/compositor/test/layer_animator_test_controller.cc',
         '../ui/compositor/test/layer_animator_test_controller.h',
         '../ui/views/test/test_views_delegate.cc',
         '../ui/views/test/test_views_delegate.h',
         'accelerators/accelerator_controller_unittest.cc',
@@ skipping 211 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }