Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation

chrome/chrome_common.gypi

 # Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'common',
       'type': 'static_library',
       'variables': {
         'chrome_common_target': 1,
       },
       'include_dirs': [
           '..',
         ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'dependencies': [
         # TODO(gregoryd): chrome_resources and chrome_strings could be
         #  shared with the 64-bit target, but it does not work due to a gyp
         # issue.
         'app/policy/cloud_policy_codegen.gyp:policy',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
-        'chrome_resources.gyp:theme_resources',
+        'chrome_resources',
+        'chrome_strings',
         'common_constants',
         'common_net',
         'default_plugin/default_plugin.gyp:default_plugin',
+        'theme_resources',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:base_static',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_common',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
@@ skipping 213 matching lines @@
               '-lXss',
               '-lXext',
             ],
           },
         },],
         ['toolkit_views==1', {
           'sources': [
             'common/native_web_keyboard_event_views.cc',
             'common/native_web_keyboard_event_views.h',
           ],
-        }],
+        }],  
         ['use_aura==1', {
           'dependencies!': [
            'default_plugin/default_plugin.gyp:default_plugin',
           ],
         }],
         ['os_posix == 1 and OS != "mac"', {
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)',
           ],
           # Because posix_version generates a header, we must set the
@@ skipping 88 matching lines @@
         'common/net/gaia/google_service_auth_error.cc',
         'common/net/gaia/google_service_auth_error.h',
         'common/net/gaia/oauth_request_signer.cc',
         'common/net/gaia/oauth_request_signer.h',
         'common/net/x509_certificate_model.cc',
         'common/net/x509_certificate_model_nss.cc',
         'common/net/x509_certificate_model_openssl.cc',
         'common/net/x509_certificate_model.h',
       ],
       'dependencies': [
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
+        'chrome_strings',
         '../base/base.gyp:base',
         '../crypto/crypto.gyp:crypto',
         '../gpu/gpu.gyp:gpu_ipc',
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac"', {
@@ skipping 32 matching lines @@
         'common/safe_browsing/csd.proto'
       ],
       'variables': {
         'proto_in_dir': 'common/safe_browsing',
         'proto_out_dir': 'chrome/common/safe_browsing',
       },
       'includes': [ '../build/protoc.gypi' ],
     },
   ],
 }