Revert 203261 "split webkit/glue/webpreferences to common and re..."

trunk/src/webkit/glue/webkit_glue.gypi

 # 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.
 
 {
   'target_defaults': {
      # Disable narrowing-conversion-in-initialization-list warnings in that we
      # do not want to fix it in data file "webcursor_gtk_data.h".
      'cflags+': ['-Wno-narrowing'],
      'cflags_cc+': ['-Wno-narrowing'],
@@ skipping 81 matching lines @@
         'webcursor_aurax11.cc',
         'webcursor_null.cc',
         'webcursor_gtk.cc',
         'webcursor_gtk_data.h',
         'webcursor_mac.mm',
         'webcursor_win.cc',
         'weburlrequest_extradata_impl.cc',
         'weburlrequest_extradata_impl.h',
         'weburlresponse_extradata_impl.cc',
         'weburlresponse_extradata_impl.h',
-        '../common/webpreferences.cc',
-        '../common/webpreferences.h',
       ],
 
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
           'sources/': [['exclude', '_x11\\.cc$']],
         }],
         ['use_aura==1', {
@@ skipping 36 matching lines @@
 
     {
       'target_name': 'glue_renderer',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'WEBKIT_EXTENSIONS_IMPLEMENTATION',
         'WEBKIT_GLUE_IMPLEMENTATION',
       ],
       'dependencies': [
+        '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         'glue_common',
       ],
 
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
       ],
 
       'sources': [
         '../renderer/cpp_bound_class.cc',
         '../renderer/cpp_bound_class.h',
         '../renderer/cpp_variant.cc',
         '../renderer/cpp_variant.h',
-        '../renderer/webpreferences_renderer.cc',
       ],
     },
 
     {
       'target_name': 'glue',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'WEBKIT_EXTENSIONS_IMPLEMENTATION',
         'WEBKIT_GLUE_IMPLEMENTATION',
@@ skipping 76 matching lines @@
         'webfileutilities_impl.h',
         'webkit_glue.cc',
         'webkit_glue.h',
         'webkit_glue_export.h',
         'webkitplatformsupport_impl.cc',
         'webkitplatformsupport_impl.h',
         'webmenuitem.cc',
         'webmenuitem.h',
         'webmenurunner_mac.h',
         'webmenurunner_mac.mm',
+        'webpreferences.cc',
+        'webpreferences.h',
         'websocketstreamhandle_bridge.h',
         'websocketstreamhandle_delegate.h',
         'websocketstreamhandle_impl.cc',
         'websocketstreamhandle_impl.h',
         'webthemeengine_impl_android.cc',
         'webthemeengine_impl_android.h',
         'webthemeengine_impl_default.cc',
         'webthemeengine_impl_default.h',
         'webthemeengine_impl_mac.cc',
         'webthemeengine_impl_mac.h',
@@ skipping 110 matching lines @@
           'variables': {
             'jni_gen_package': 'webkit',
             'input_java_class': 'android/widget/OverScroller.class',
           },
           'includes': [ '../../build/jar_file_jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }