Reland http://codereview.chromium.org/9121050/ with fix for aura_win

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 12 matching lines @@
         'common_net',
         'debugger',
         'in_memory_url_index_cache_proto',
         'installer_util',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         # TODO(sync): Make browser not depend on syncapi_core directly.
         'syncapi_core',
         'syncapi_service',
         'feedback_proto',
+        '../ash/ash.gyp:ash_strings',

[tony, 2012/02/07 18:16:00]

Is this needed?  Does a browser .cc file actually include grit/ash_strings.h?

         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_browser',
         '../crypto/crypto.gyp:crypto',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',  # For PpapiMsg_LoadPlugin
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/cld/cld.gyp:cld',
@@ skipping 5398 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }