Remove ResourceDispatcherHost dependency on Chrome's LoginHandler and ExternalProtocolHandler.

chrome/renderer/chrome_render_process_observer.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/renderer/chrome_render_process_observer.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_localization_peer.h"
 #include "chrome/common/net/net_resource_provider.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/renderer/security_filter_peer.h"
 #include "content/common/resource_dispatcher.h"
+#include "content/common/resource_dispatcher_delegate.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/render_view_visitor.h"
 #include "crypto/nss_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_module.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
@@ skipping 13 matching lines @@
 #endif
 
 using WebKit::WebCache;
 using WebKit::WebCrossOriginPreflightResultCache;
 using WebKit::WebFontCache;
 
 namespace {
 
 static const unsigned int kCacheStatsDelayMS = 2000 /* milliseconds */;
 
-class RenderResourceObserver : public ResourceDispatcher::Observer {
+class RendererResourceDelegate : public ResourceDispatcherDelegate {
  public:
-  RenderResourceObserver()
+  RendererResourceDelegate()
       : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   }
 
   virtual webkit_glue::ResourceLoaderBridge::Peer* OnRequestComplete(
       webkit_glue::ResourceLoaderBridge::Peer* current_peer,
       ResourceType::Type resource_type,
       const net::URLRequestStatus& status) {
     // Update the browser about our cache.
     // Rate limit informing the host of our cache stats.
     if (method_factory_.empty()) {
       MessageLoop::current()->PostDelayedTask(
          FROM_HERE,
          method_factory_.NewRunnableMethod(
-             &RenderResourceObserver::InformHostOfCacheStats),
+             &RendererResourceDelegate::InformHostOfCacheStats),
          kCacheStatsDelayMS);
     }
 
     if (status.status() != net::URLRequestStatus::CANCELED ||
         status.os_error() == net::ERR_ABORTED) {
       return NULL;
     }
 
     // Resource canceled with a specific error are filtered.
     return SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(
         resource_type, current_peer, status.os_error());
   }
 
   virtual webkit_glue::ResourceLoaderBridge::Peer* OnReceivedResponse(
       webkit_glue::ResourceLoaderBridge::Peer* current_peer,
       const std::string& mime_type,
       const GURL& url) {
     return ExtensionLocalizationPeer::CreateExtensionLocalizationPeer(
         current_peer, RenderThread::current(), mime_type, url);
   }
 
  private:
   void InformHostOfCacheStats() {
     WebCache::UsageStats stats;
     WebCache::getUsageStats(&stats);
     RenderThread::current()->Send(new ViewHostMsg_UpdatedCacheStats(stats));
   }
 
-  ScopedRunnableMethodFactory<RenderResourceObserver> method_factory_;
+  ScopedRunnableMethodFactory<RendererResourceDelegate> method_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(RenderResourceObserver);
+  DISALLOW_COPY_AND_ASSIGN(RendererResourceDelegate);
 };
 
 class RenderViewContentSettingsSetter : public RenderViewVisitor {
  public:
   RenderViewContentSettingsSetter(const GURL& url,
                                   const ContentSettings& content_settings)
       : url_(url),
         content_settings_(content_settings) {
   }
 
@@ skipping 189 matching lines @@
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableWatchdog)) {
     // TODO(JAR): Need to implement renderer IO msgloop watchdog.
   }
 
   if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) {
     base::StatisticsRecorder::set_dump_on_exit(true);
   }
 
   RenderThread* thread = RenderThread::current();
-  thread->resource_dispatcher()->set_observer(new RenderResourceObserver());
+  resource_delegate_.reset(new RendererResourceDelegate());
+  thread->resource_dispatcher()->set_delegate(resource_delegate_.get());
 
 #if defined(OS_POSIX)
   thread->AddFilter(new SuicideOnChannelErrorFilter());
 #endif
 
 #if defined(OS_MACOSX)
   // TODO(viettrungluu): Code taken from browser_main.cc.
   int pipefd[2];
   int ret = pipe(pipefd);
   if (ret < 0) {
@@ skipping 154 matching lines @@
   // to free everything possible in just one pass.
   while (!v8::V8::IdleNotification()) {
   }
 
 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
   // Tell tcmalloc to release any free pages it's still holding.
   MallocExtension::instance()->ReleaseFreeMemory();
 #endif
 }