Update Gears to r3147, and fix scons build to match.

gears/SConscript.inputs

 # Copyright (c) 2008 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.
 
 Import('env')
 
 types = ['CPPSRCS', 'M4SRCS', 'HTML_M4SRCS', 'I18N_M4SRCS', 'STABSRCS',
          'IDLSRCS', 'RESSRCS', 'LINKSRCS', 'SHLINKSRCS']
 
 # Set up aliases for shared inputs.
@@ skipping 502 matching lines @@
 if env['OS'] == 'win32':
   env.Append(NPAPI_CPPSRCS = [
       '$OPEN_DIR/desktop/desktop_cr.cc',
   ])
 
 env.Append(BROWSER_CPPSRCS = [
     '$OPEN_DIR/desktop/file_dialog.cc',
     '$OPEN_DIR/desktop/file_dialog_gtk.cc',
     '$OPEN_DIR/desktop/file_dialog_osx.cc',
     '$OPEN_DIR/desktop/file_dialog_win32.cc',
+    '$OPEN_DIR/desktop/file_dialog_android.cc',
 ])
 
 # The browser module also needs these files, to communicate with the notifier.
 env.Append(BROWSER_CPPSRCS = [
     '$OPEN_DIR/notifier/const_notifier.cc',
     '$OPEN_DIR/notifier/notifier_process_linux.cc',
     '$OPEN_DIR/notifier/notifier_process_posix.cc',
     '$OPEN_DIR/notifier/notifier_process_win32.cc',
     '$OPEN_DIR/notifier/notifier_proxy.cc',
     '$OPEN_DIR/notifier/notifier_utils_win32.cc',
     '$OPEN_DIR/notifier/notification.cc',
 ])
 
-env.Append(FF3_CPPSRCS = [
-    '$OPEN_DIR/desktop/drag_and_drop_utils_ff.cc',
-    '$OPEN_DIR/desktop/drop_target_ff.cc',
-])
-
-env.Append(IE_CPPSRCS = [
-    '$OPEN_DIR/desktop/drag_and_drop_utils_ie.cc',
-    '$OPEN_DIR/desktop/drop_target_ie.cc',
-])
-
 if not env['OFFICIAL_BUILD']:
   # The Drag-and-Drop API has not been finalized for official builds.
+  env.Append(BROWSER_CPPSRCS = [
+      '$OPEN_DIR/desktop/drag_and_drop_utils_common.cc',
+  ])
+
+  env.Append(FF3_CPPSRCS = [
+      '$OPEN_DIR/desktop/drag_and_drop_utils_ff.cc',
+      '$OPEN_DIR/desktop/drop_target_ff.cc',
+  ])
+
+  env.Append(IE_CPPSRCS = [
+      '$OPEN_DIR/desktop/drag_and_drop_utils_ie.cc',
+      '$OPEN_DIR/desktop/drop_target_ie.cc',
+  ])
+
   env.Append(SF_CPPSRCS = [
       '$OPEN_DIR/desktop/drag_and_drop_utils_sf.mm',
       '$OPEN_DIR/desktop/drop_target_sf.cc',
   ])
 
 #-----------------------------------------------------------------------------
 # localserver/common
 
 env.Append(BROWSER_CPPSRCS = [
     '$OPEN_DIR/localserver/common/async_task_test.cc',
     '$OPEN_DIR/localserver/common/blob_store.cc',
     '$OPEN_DIR/localserver/common/capture_task.cc',
     '$OPEN_DIR/localserver/common/file_store.cc',
     '$OPEN_DIR/localserver/common/http_constants.cc',
     '$OPEN_DIR/localserver/common/localserver.cc',
     '$OPEN_DIR/localserver/common/localserver_db.cc',
     '$OPEN_DIR/localserver/common/localserver_perf_test.cc',
     '$OPEN_DIR/localserver/common/managed_resource_store.cc',
     '$OPEN_DIR/localserver/common/manifest.cc',
+    '$OPEN_DIR/localserver/common/progress_event.cc',
     '$OPEN_DIR/localserver/common/resource_store.cc',
     '$OPEN_DIR/localserver/common/safe_http_request.cc',
     '$OPEN_DIR/localserver/common/update_task.cc',
     '$OPEN_DIR/localserver/common/update_task_single_process.cc',
     '$OPEN_DIR/localserver/file_submitter.cc',
     '$OPEN_DIR/localserver/localserver_module.cc',
     '$OPEN_DIR/localserver/managed_resource_store_module.cc',
     '$OPEN_DIR/localserver/resource_store_module.cc',
 ])
 
@@ skipping 28 matching lines @@
 #-----------------------------------------------------------------------------
 # localserver/safari
 
 env.Append(SF_CPPSRCS = [
     '$OPEN_DIR/localserver/safari/async_task_sf.mm',
      '$OPEN_DIR/localserver/safari/http_cookies_sf.mm',
      '$OPEN_DIR/localserver/safari/http_handler.mm',
      '$OPEN_DIR/localserver/safari/http_request_delegate.mm',
      '$OPEN_DIR/localserver/safari/http_request_sf.mm',
      '$OPEN_DIR/localserver/safari/localserver_db_proxy.mm',
-     '$OPEN_DIR/localserver/common/progress_event.cc',
      '$OPEN_DIR/localserver/safari/progress_input_stream.mm',
      '$OPEN_DIR/localserver/safari/ui_thread.cc'
 ])
 
 #-----------------------------------------------------------------------------
 # localserver/firefox
 
 env.Append(FF3_CPPSRCS = [
-    '$OPEN_DIR/localserver/common/progress_event.cc',
     '$OPEN_DIR/localserver/firefox/async_task_ff.cc',
     '$OPEN_DIR/localserver/firefox/cache_intercept.cc',
     '$OPEN_DIR/localserver/firefox/http_request_ff.cc',
     '$OPEN_DIR/localserver/firefox/progress_input_stream.cc',
 ])
 
 #-----------------------------------------------------------------------------
 # localserver/ie
 
 env.Append(IE_CPPSRCS = [
     '$OPEN_DIR/localserver/ie/async_task_ie.cc',
     '$OPEN_DIR/localserver/ie/file_submit_behavior.cc',
     '$OPEN_DIR/localserver/ie/http_handler_ie.cc',
     '$OPEN_DIR/localserver/ie/http_request_ie.cc',
-    '$OPEN_DIR/localserver/common/progress_event.cc',
     '$OPEN_DIR/localserver/ie/progress_input_stream.cc',
     '$OPEN_DIR/localserver/ie/update_task_ie.cc',
     '$OPEN_DIR/localserver/ie/urlmon_utils.cc',
 ])
 
 #-----------------------------------------------------------------------------
 # dummy_module
 
 env.Append(BROWSER_CPPSRCS = [
     '$OPEN_DIR/dummy/dummy_module.cc',
@@ skipping 17 matching lines @@
     '$OPEN_DIR/ui/common/permissions_dialog.html_m4',
     '$OPEN_DIR/ui/common/settings_dialog.html_m4',
     '$OPEN_DIR/ui/common/shortcuts_dialog.html_m4',
 ])
 
 env.Append(FF3_I18N_M4SRCS = [
     '$OPEN_DIR/ui/generated/' + lang + '/i18n.dtd.m4'
     for lang in env['I18N_LANGS']
 ])
 
-#TODO: $(IE_OUTDIR)/string_table.res
-
 #-----------------------------------------------------------------------------
 # ui/common (built for all browsers)
 
 env.Append(BROWSER_CPPSRCS = [
     '$OPEN_DIR/ui/common/alert_dialog.cc',
     '$OPEN_DIR/ui/common/html_dialog.cc',
     '$OPEN_DIR/ui/common/i18n_strings.cc',
     '$OPEN_DIR/ui/common/permissions_dialog.cc',
     '$OPEN_DIR/ui/common/window_utils.cc',
 ])
@@ skipping 273 matching lines @@
     '$OPEN_DIR/geolocation/wifi_data_provider_android.cc',
     '$OPEN_DIR/geolocation/wifi_data_provider_common.cc',
     '$OPEN_DIR/geolocation/wifi_data_provider_linux.cc',
     '$OPEN_DIR/geolocation/wifi_data_provider_osx.cc',
     '$OPEN_DIR/geolocation/wifi_data_provider_win32.cc',
     '$OPEN_DIR/geolocation/wifi_data_provider_wince.cc',
     '$OPEN_DIR/geolocation/wifi_data_provider_windows_common.cc',
 ])
 
 #-----------------------------------------------------------------------------
-# media
-
-# The Audio API has not been finalized for official builds.
-if not env['OFFICIAL_BUILD']:
-  env.Append(BROWSER_CPPSRCS = [
-      '$OPEN_DIR/media/audio.cc',
-      '$OPEN_DIR/media/audio_recorder.cc',
-      '$OPEN_DIR/media/audio_recorder_test.cc',
-      '$OPEN_DIR/media/base_audio_recorder.cc',
-      '$OPEN_DIR/media/media.cc',
-      '$OPEN_DIR/media/media_data.cc',
-      '$OPEN_DIR/media/mock_audio_recorder.cc',
-      '$OPEN_DIR/media/pa_audio_recorder.cc',
-      '$OPEN_DIR/media/time_ranges.cc',
-  ])
-
-#-----------------------------------------------------------------------------
 # vista_broker
 
 env.Append(VISTA_BROKER_CPPSRCS = [
     '$OPEN_DIR/base/common/process_utils_win32.cc',
     '$OPEN_DIR/base/common/string16.cc',
     '$OPEN_DIR/base/common/string_utils.cc',
     '$OPEN_DIR/desktop/shortcut_utils_win32.cc',
     '$OPEN_DIR/vista_broker/vista_broker.cc',
 
     '$THIRD_PARTY_DIR/convert_utf/ConvertUTF.c'
@@ skipping 27 matching lines @@
 ])
 
 #-----------------------------------------------------------------------------
 # resources
 
 env.Append(NPAPI_RESSRCS = [
     '$GENFILES_DIR/ui_resources.rc',
     '$OPEN_DIR/base/npapi/module.rc',
 ])
 
+# The string table uses multiple languages, which are not supported by
+# LoadString on WinCE.
+if env['OS'] != 'wince':
+  env.Append(IE_RESSRCS = [
+      '$GENFILES_DIR/string_table.rc',
+  ])
+
 env.Append(IE_RESSRCS = [
-    '$GENFILES_DIR/string_table.rc',
     '$GENFILES_DIR/ui_resources.rc',
     '$OPEN_DIR/base/npapi/module.rc',
 ])
 
 env.Append(FF3_RESOURCES = [
     '$FF3_OUTDIR/genfiles/browser-overlay.js',
     '$FF3_OUTDIR/genfiles/browser-overlay.xul',
     '$FF3_OUTDIR/genfiles/permissions_dialog.html',
     '$FF3_OUTDIR/genfiles/settings_dialog.html',
     '$FF3_OUTDIR/genfiles/shortcuts_dialog.html',
@@ skipping 13 matching lines @@
 #-----------------------------------------------------------------------------
 # libs
 
 if not env['OFFICIAL_BUILD'] and env['OS'] in ['win32', 'osx']:
   env.Append(
       LIBPATH = ['$THIRD_PARTY_DIR/skia'],
       LIBS = ['${LIBPREFIX}skia-${MODE}-${OS}-${ARCH}${LIBSUFFIX}'],
   )
 
 if env['OS'] == 'win32':
-  env.Append(NPAPI_LINKSRCS = [
-      '$THIRD_PARTY_DIR/v8/bin-${MODE}/libv8core.lib',
-      '$THIRD_PARTY_DIR/v8/bin-${MODE}/no_snapshotv8.lib',
-      '$THIRD_PARTY_DIR/v8/bin-${MODE}/libjscre.lib',
+  env.Append(NPAPI_SHLINKSRCS = [
+      '$THIRD_PARTY_DIR/v8/bin-${MODE}/v8_base.lib',
+      '$THIRD_PARTY_DIR/v8/bin-${MODE}/v8_snapshot.lib',
   ])
   env.Append(NPAPI_SHLINKSRCS = [
       '$OPEN_DIR/base/chrome/module.def',
   ])
   env.Append(IE_SHLINKSRCS = [
       '$OPEN_DIR/tools/mscom.def',
   ])
 
 Return('env')