Update to Chromium revision 131752.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@587 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

cef1/libcef/browser_webview_delegate.cc

@@ -30,10 +30,11 @@
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "media/audio/null_audio_sink.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_log.h"
 #include "media/base/message_loop_factory.h"
-#include "media/filters/null_audio_renderer.h"
+#include "media/filters/audio_renderer_impl.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
@@ -677,7 +678,8 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
 
   // Add the audio renderer.
   // TODO(vrk): Re-enable audio. (crbug.com/112159)
-  collection->AddAudioRenderer(new media::NullAudioRenderer());
+  collection->AddAudioRenderer(
+      new media::AudioRendererImpl(new media::NullAudioSink()));
 
   return new webkit_media::WebMediaPlayerImpl(
       frame,

cef1/libcef/browser_webview_delegate.h

@@ -33,7 +33,7 @@
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
 #include <gdk/gdk.h>  // NOLINT(build/include_order)
 #endif
 

cef1/libcef/webview_host.h

@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "ui/gfx/native_widget_types.h"
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
 #include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
 #endif
 
@@ -39,7 +39,7 @@ class WebViewHost : public WebWidgetHost {
 
   WebKit::WebView* webview() const;
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
   // Create a new plugin parent container for a given plugin XID.
   void CreatePluginContainer(gfx::PluginWindowHandle id);
 
@@ -67,7 +67,7 @@ class WebViewHost : public WebWidgetHost {
   virtual void KeyEvent(UINT message, WPARAM wparam, LPARAM lparam);
 #endif
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
   // Helper class that creates and moves plugin containers.
   webkit::npapi::GtkPluginContainerManager plugin_container_manager_;
 #endif

cef1/libcef/webwidget_host.h

@@ -30,7 +30,7 @@
 #include "ui/base/win/ime_input.h"
 #endif
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>  // NOLINT(build/include_order)
 #endif
 
@@ -186,7 +186,7 @@ class WebWidgetHost {
   virtual void SetFocus(bool enable);
 
  protected:
-#elif defined(TOOLKIT_USES_GTK)
+#elif defined(TOOLKIT_GTK)
 
  public:
   // ---------------------------------------------------------------------------
@@ -284,7 +284,7 @@ class WebWidgetHost {
   WebKit::WebRect caret_bounds_;
 #endif
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
   // Since GtkWindow resize is asynchronous, we have to stash the dimensions,
   // so that the backing store doesn't have to wait for sizing to take place.
   gfx::Size logical_size_;

cef1/patch/patches/base.patch

@@ -1,8 +1,8 @@
 Index: message_loop.cc
 ===================================================================
---- message_loop.cc	(revision 130586)
+--- message_loop.cc	(revision 131752)
 +++ message_loop.cc	(working copy)
-@@ -361,9 +361,13 @@
+@@ -362,9 +362,13 @@
  }
  
  void MessageLoop::AssertIdle() const {
@@ -19,9 +19,9 @@ Index: message_loop.cc
  bool MessageLoop::is_running() const {
 Index: message_loop.h
 ===================================================================
---- message_loop.h	(revision 130586)
+--- message_loop.h	(revision 131752)
 +++ message_loop.h	(working copy)
-@@ -350,6 +350,9 @@
+@@ -346,6 +346,9 @@
    // Asserts that the MessageLoop is "idle".
    void AssertIdle() const;