- Restore FTP protocol support that was removed by a recent Chromium update.

- Register the net resource provider for render processes (issue #999).

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

libcef/browser/browser_main.cc

@@ -10,7 +10,7 @@
 #include "libcef/browser/browser_message_loop.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/devtools_delegate.h"
-#include "libcef/common/content_client.h"
+#include "libcef/common/net_resource_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -26,15 +26,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
 
-namespace {
-
-base::StringPiece ResourceProvider(int resource_id) {
-  return CefContentClient::Get()->GetDataResource(resource_id,
-                                                  ui::SCALE_FACTOR_NONE);
-}
-
-}  // namespace
-
 CefBrowserMainParts::CefBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : BrowserMainParts(),
@@ -61,7 +52,7 @@ void CefBrowserMainParts::PostMainMessageLoopStart() {
 
 int CefBrowserMainParts::PreCreateThreads() {
   PlatformInitialize();
-  net::NetModule::SetResourceProvider(&ResourceProvider);
+  net::NetModule::SetResourceProvider(&NetResourceProvider);
 
   // Initialize the GpuDataManager before IO access restrictions are applied and
   // before the IO thread is started.