libcef: Update due to underlying chromium changes.

- WebKit API changes.
- Use net::ProxyConfigService in BrowserRequestContext.

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

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -44,3 +44,4 @@ Date       | CEF Revision                    | Chromium Revision
 2009-10-12 | /trunk@53                       | /trunk@28713
 2009-10-18 | /trunk@58                       | /trunk@29378
 2009-10-21 | /trunk@60                       | /trunk@29687
+2009-10-25 | /trunk@61                       | /trunk@30028

libcef/browser_request_context.cc

@@ -12,6 +12,8 @@
 #include "net/base/host_resolver.h"
 #include "net/base/ssl_config_service.h"
 #include "net/ftp/ftp_network_layer.h"
+#include "net/proxy/proxy_config_service.h"
+#include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ -36,10 +38,12 @@ void BrowserRequestContext::Init(
   accept_language_ = "en-us,en";
   accept_charset_ = "iso-8859-1,*,utf-8";
 
-  net::ProxyConfig proxy_config;
+  // Use the system proxy settings.
+  scoped_ptr<net::ProxyConfigService> proxy_config_service(
+      net::ProxyService::CreateSystemProxyConfigService(NULL, NULL));
   host_resolver_ = net::CreateSystemHostResolver();
-  proxy_service_ = net::ProxyService::Create(no_proxy ? &proxy_config : NULL,
-                                             false, NULL, NULL, NULL);
+  proxy_service_ = net::ProxyService::Create(proxy_config_service.release(),
+                                             false, NULL, NULL);
   ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService();
 
   net::HttpCache *cache;

libcef/browser_socket_stream_bridge.cc

@@ -25,14 +25,12 @@ MessageLoop* g_io_thread;
 scoped_refptr<URLRequestContext> g_request_context;
 
 class WebSocketStreamHandleBridgeImpl
-    : public base::RefCountedThreadSafe<WebSocketStreamHandleBridgeImpl>,
-      public WebSocketStreamHandleBridge,
+    : public WebSocketStreamHandleBridge,
       public net::SocketStream::Delegate {
  public:
   WebSocketStreamHandleBridgeImpl(
       WebKit::WebSocketStreamHandle* handle,
       webkit_glue::WebSocketStreamHandleDelegate* delegate);
-  virtual ~WebSocketStreamHandleBridgeImpl();
 
   // WebSocketStreamHandleBridge methods.
   virtual void Connect(const GURL& url);
@@ -50,6 +48,8 @@ class WebSocketStreamHandleBridgeImpl
 
 
  private:
+  virtual ~WebSocketStreamHandleBridgeImpl();
+
   // Runs on |g_io_thread|;
   void DoConnect(const GURL& url);
   void DoSend(std::vector<char>* data);

libcef/browser_webkit_init.h

@@ -20,6 +20,7 @@
 #include "webkit/api/public/WebData.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebScriptController.h"
+#include "webkit/api/public/WebSecurityPolicy.h"
 #include "webkit/api/public/WebStorageArea.h"
 #include "webkit/api/public/WebStorageEventDispatcher.h"
 #include "webkit/api/public/WebStorageNamespace.h"
@@ -41,12 +42,14 @@ class BrowserWebKitInit : public webkit_glue::WebKitClientImpl {
 
     WebKit::initialize(this);
     WebKit::setLayoutTestMode(false);
-    WebKit::registerURLSchemeAsLocal(
+    WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(
         ASCIIToUTF16(webkit_glue::GetUIResourceProtocol()));
-    WebKit::registerURLSchemeAsNoAccess(
+    WebKit::WebSecurityPolicy::registerURLSchemeAsNoAccess(
         ASCIIToUTF16(webkit_glue::GetUIResourceProtocol()));
-    WebKit::registerExtension(extensions_v8::GearsExtension::Get());
-    WebKit::registerExtension(extensions_v8::IntervalExtension::Get());
+    WebKit::WebScriptController::registerExtension(
+        extensions_v8::GearsExtension::Get());
+    WebKit::WebScriptController::registerExtension(
+        extensions_v8::IntervalExtension::Get());
     WebKit::enableWebSockets();
 
     // Load libraries for media and enable the media player.

libcef/browser_webview_delegate.cc

@@ -481,9 +481,16 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
           base::GetCurrentProcId(),
           appcache::kNoHostId,
           0);
-  factory->AddFactory(webkit_glue::BufferedDataSource::CreateFactory(
-      MessageLoop::current(), bridge_factory));
-  // TODO(hclam): Use command line switch to determine which data source to use.
+  // A simple data source that keeps all data in memory.
+  media::FilterFactory* simple_data_source_factory =
+      webkit_glue::SimpleDataSource::CreateFactory(MessageLoop::current(),
+                                                   bridge_factory);
+  // A sophisticated data source that does memory caching.
+  media::FilterFactory* buffered_data_source_factory =
+      webkit_glue::BufferedDataSource::CreateFactory(MessageLoop::current(),
+                                                     bridge_factory);
+  factory->AddFactory(buffered_data_source_factory);
+  factory->AddFactory(simple_data_source_factory);
   return new webkit_glue::WebMediaPlayerImpl(client, factory);
 }
 

libcef/context.cc

@@ -19,6 +19,7 @@
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "net/base/net_module.h"
+#include "webkit/api/public/WebScriptController.h"
 #include "webkit/extensions/v8/gc_extension.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/plugin_lib.h"
@@ -196,7 +197,8 @@ bool CefContext::DoInitialize()
   // CEF always exposes the GC.
   webkit_glue::SetJavaScriptFlags(L"--expose-gc");
   // Expose GCController to JavaScript.
-  WebKit::registerExtension(extensions_v8::GCExtension::Get());
+  WebKit::WebScriptController::registerExtension(
+      extensions_v8::GCExtension::Get());
 
   return true;
 }

libcef/v8_impl.cc

@@ -125,7 +125,7 @@ public:
 
   void UIT_RegisterExtension()
   {
-    WebKit::registerExtension(this);
+    WebKit::WebScriptController::registerExtension(this);
   }
 
   void AddRef() {}