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

- media module removed
- pulseaudio removed
- sqlite, libpng, other libs updated
- minor files added
Review URL: http://codereview.chromium.org/16586

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7698 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 39 insertions, 165 deletions

diff --git a/gears/DEPS b/gears/DEPS
index b6a6cc0..12dc8cb 100644
--- a/gears/DEPS
+++ b/gears/DEPS
@@ -2,7 +2,7 @@
 chrome_rev = ''
 
 # We pull 2 components from the Gears tree at this revision.
-gears_rev = '@3081'
+gears_rev = '@3147'
 
 deps = {
   "src/build":
diff --git a/gears/SConscript b/gears/SConscript
index 8c1d4b9..345c5c1 100644
--- a/gears/SConscript
+++ b/gears/SConscript
@@ -96,8 +96,8 @@ env.Replace(
 env.Replace(
     MAJOR = '0',
     MINOR = '5',
-    BUILD = '2',
-    PATCH = '6',
+    BUILD = '7',
+    PATCH = '0',
     VERSION = '${MAJOR}.${MINOR}.${BUILD}.${PATCH}',
 
     FRIENDLY_NAME = 'Google Gears',
@@ -350,8 +350,14 @@ if env['OFFICIAL_BUILD']:
       M4FLAGS = '-DOFFICIAL_BUILD=1',
   )
 
-# TODO: if USING_PNG
-env.Append(CPPDEFINES = 'PNG_USER_CONFIG')
+# TODO: if USING_LIBPNG
+env.Append(
+    CPPDEFINES = [
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+        'GEARS_PNG_BUILD',
+    ]
+)
 # TODO: if USING_ZLIB
 env.Append(
     CPPDEFINES = [
@@ -639,9 +645,6 @@ elif env['OS'] == 'linux':
           '-shared',
           '-Wl,--version-script',
           '-Wl,$OPEN_DIR/tools/xpcom-ld-script',
-# for PortAudio: need pthread and math
-          '-lpthread',
-          '-lm',
 # Additions to compile on hardy
           '-m32',
       ],
@@ -745,13 +748,6 @@ elif env['OS'] == 'osx':
           '-DGEARS_TOOLS_DIR="$MAIN_DIR/$PRIVATE_DIR/tools"',
       ],
   )
-  if not env['OFFICIAL_BUILD']:
-    # For PortAudio:
-    env.Append(FRAMEWORKS = [
-        'CoreAudio',
-        'AudioToolbox',
-        'AudioUnit',
-    ])
   if env['MODE'] == 'dbg':
     env.Append(
         CPPFLAGS = [
@@ -930,7 +926,6 @@ sconscripts = [
     'SConscript.zlib',
     'SConscript.libbreakpad_osx',
     'SConscript.libgd',
-    'SConscript.portaudio',
 ]
 
 for each in sconscripts:
diff --git a/gears/SConscript.browser b/gears/SConscript.browser
index 038878f..ffb0c30 100644
--- a/gears/SConscript.browser
+++ b/gears/SConscript.browser
@@ -207,7 +207,6 @@ if env['OS'] == 'osx':
 if not env['OFFICIAL_BUILD']:
   env.Append(LIBS = [
       'jpeg-gears',
-      'portaudio',
       'gd',
   ])
 
@@ -225,7 +224,6 @@ if env['OS'] == 'android':
   env.FilterOut(LIBS = [
     'googleurl-gears',
     'sqlite-gears',
-    'portaudio',
     'png-gears',
     'zlib-gears',
     'jpeg-gears',
diff --git a/gears/SConscript.googleurl b/gears/SConscript.googleurl
index 3b75b57..14605b9 100644
--- a/gears/SConscript.googleurl
+++ b/gears/SConscript.googleurl
@@ -42,7 +42,7 @@ input_files = [
 #    '$GURL_DIR/src/url_canon_icu.cc',
     '$GURL_DIR/src/url_canon_internal.cc',
     '$GURL_DIR/src/url_canon_ip.cc',
-#    '$GURL_DIR/src/url_canon_mailtourl.cc',
+    '$GURL_DIR/src/url_canon_mailtourl.cc',
     '$GURL_DIR/src/url_canon_path.cc',
     '$GURL_DIR/src/url_canon_pathurl.cc',
     '$GURL_DIR/src/url_canon_query.cc',
diff --git a/gears/SConscript.inputs b/gears/SConscript.inputs
index 1efe16b..60ee805 100755
--- a/gears/SConscript.inputs
+++ b/gears/SConscript.inputs
@@ -520,6 +520,7 @@ env.Append(BROWSER_CPPSRCS = [
     '$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.
@@ -533,18 +534,22 @@ env.Append(BROWSER_CPPSRCS = [
     '$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',
@@ -564,6 +569,7 @@ env.Append(BROWSER_CPPSRCS = [
     '$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',
@@ -612,7 +618,6 @@ env.Append(SF_CPPSRCS = [
      '$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'
 ])
@@ -621,7 +626,6 @@ env.Append(SF_CPPSRCS = [
 # 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',
@@ -636,7 +640,6 @@ env.Append(IE_CPPSRCS = [
     '$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',
@@ -674,8 +677,6 @@ env.Append(FF3_I18N_M4SRCS = [
     for lang in env['I18N_LANGS']
 ])
 
-#TODO: $(IE_OUTDIR)/string_table.res
-
 #-----------------------------------------------------------------------------
 # ui/common (built for all browsers)
 
@@ -969,23 +970,6 @@ env.Append(BROWSER_CPPSRCS = [
 ])
 
 #-----------------------------------------------------------------------------
-# 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 = [
@@ -1033,8 +1017,14 @@ env.Append(NPAPI_RESSRCS = [
     '$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',
 ])
@@ -1068,10 +1058,9 @@ if not env['OFFICIAL_BUILD'] and env['OS'] in ['win32', 'osx']:
   )
 
 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',
diff --git a/gears/SConscript.portaudio b/gears/SConscript.portaudio
deleted file mode 100644
index f053763..0000000
--- a/gears/SConscript.portaudio
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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')
-
-env = env.Clone(
-)
-
-env.Replace(
-    PA_DIR = '$THIRD_PARTY_DIR/portaudio',
-    CPPPATH = [
-        '$PA_DIR/include',
-        '$PA_DIR/src/common',
-        '$VC80_CPPPATH',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'PA_NO_DS',
-        'PA_NO_ASIO',
-    ],
-)
-
-if env['OS'] in ['win32', 'wince']:
-  env.Append(
-      CPPPATH = [
-          '$PA_DIR/src/os/win',
-      ],
-      CPPFLAGS = [
-          '/wd4133',
-          '/wd4101',
-      ],
-  )
-elif env['OS'] == 'linux':
-  env.Append(
-      CPPPATH = [
-          '$PA_DIR/src/os/unix',
-      ],
-      CPPFLAGS = [
-# disable some warnings
-          '-Wno-unused-variable',
-# enable multithreading support with pthread library
-          '-pthread',
-      ],
-      CPPDEFINES = [
-# build only the OSS hostapi for linux
-          'PA_USE_OSS',
-          'HAVE_SYS_SOUNDCARD_H=1',
-      ],
-  )
-elif env['OS'] == 'osx':
-  env.Append(
-      CPPPATH = [
-          '$PA_DIR/src/hostapi/coreaudio',
-          '$PA_DIR/src/hostapi/mac_osx',
-          '$PA_DIR/src/os/unix',
-      ],
-      CPPFLAGS = [
-# disable some warnings
-          '-Wno-unused-variable',
-          '-Wno-uninitialized',
-      ],
-      CPPDEFINES = [
-          'PA_USE_COREAUDIO',
-      ],
-  )
-
-input_files = [
-    '$PA_DIR/src/common/pa_allocation.c',
-    '$PA_DIR/src/common/pa_converters.c',
-    '$PA_DIR/src/common/pa_cpuload.c',
-    '$PA_DIR/src/common/pa_debugprint.c',
-    '$PA_DIR/src/common/pa_dither.c',
-    '$PA_DIR/src/common/pa_front.c',
-    '$PA_DIR/src/common/pa_process.c',
-    '$PA_DIR/src/common/pa_skeleton.c',
-    '$PA_DIR/src/common/pa_stream.c',
-    '$PA_DIR/src/common/pa_trace.c',
-]
-
-# Platform-specific inputs
-if env['OS'] in ['win32', 'wince']:
-  input_files += [
-    '$PA_DIR/src/hostapi/wmme/pa_win_wmme.c',
-    '$PA_DIR/src/os/win/pa_win_hostapis.c',
-    '$PA_DIR/src/os/win/pa_win_util.c',
-    '$PA_DIR/src/os/win/pa_win_waveformat.c',
-  ]
-elif env['OS'] == 'linux':
-  input_files += [
-    '$PA_DIR/src/hostapi/oss/pa_unix_oss.c',
-    '$PA_DIR/src/os/unix/pa_unix_hostapis.c',
-    '$PA_DIR/src/os/unix/pa_unix_util.c',
-  ]
-elif env['OS'] == 'osx':
-  input_files += [
-    '$PA_DIR/src/common/pa_ringbuffer.c',
-    '$PA_DIR/src/hostapi/coreaudio/pa_mac_core.c',
-    '$PA_DIR/src/hostapi/coreaudio/pa_mac_core_blocking.c',
-    '$PA_DIR/src/hostapi/coreaudio/pa_mac_core_utilities.c',
-    '$PA_DIR/src/os/mac_osx/pa_mac_hostapis.c',
-    '$PA_DIR/src/os/unix/pa_unix_util.c',
-  ]
-
-env.GearsStaticLibrary('portaudio', input_files)
diff --git a/gears/SConscript.sqlite b/gears/SConscript.sqlite
index e8af255..4dafe59 100644
--- a/gears/SConscript.sqlite
+++ b/gears/SConscript.sqlite
@@ -42,10 +42,9 @@ env.Append(
         'SQLITE_ENABLE_BROKEN_FTS2',
         'THREADSAFE=1',
         'SQLITE_DEFAULT_FILE_PERMISSIONS=0600',
-        'SQLITE_OMIT_ATTACH=1',
         'SQLITE_OMIT_LOAD_EXTENSION=1',
-        'SQLITE_OMIT_VACUUM=1',
         'SQLITE_TRANSACTION_DEFAULT_IMMEDIATE=1',
+        'SQLITE_GEARS_DISABLE_SHELL_ICU',
     ],
 )