Make RenderView not have to know about how PhishingClassifierDelegate.

chrome/renderer/render_thread.cc

 // Copyright (c) 2010 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/render_thread.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/stats_table.h"
 #include "base/process_util.h"
-#include "base/scoped_callback_factory.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/threading/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/database_messages.h"
@@ skipping 32 matching lines @@
 #include "chrome/renderer/loadtimes_extension_bindings.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/render_process_impl.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/render_view_visitor.h"
 #include "chrome/renderer/renderer_histogram_snapshots.h"
 #include "chrome/renderer/renderer_webidbfactory_impl.h"
 #include "chrome/renderer/renderer_webkitclient_impl.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
-#include "chrome/renderer/safe_browsing/scorer.h"
 #include "chrome/renderer/search_extension.h"
 #include "chrome/renderer/searchbox_extension.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/user_script_slave.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_platform_file.h"
 #include "net/base/net_util.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
@@ skipping 127 matching lines @@
     return true;
   }
 
  private:
   std::string host_;
   double zoom_level_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewZoomer);
 };
 
-class RenderViewPhishingScorerSetter : public RenderViewVisitor {
- public:
-  explicit RenderViewPhishingScorerSetter(const safe_browsing::Scorer* scorer)
-      : scorer_(scorer) {
-  }
-
-  virtual bool Visit(RenderView* render_view) {
-    safe_browsing::PhishingClassifierDelegate* delegate =
-        render_view->phishing_classifier_delegate();
-    if (delegate)
-      delegate->SetPhishingScorer(scorer_);
-    return true;
-  }
-
- private:
-  const safe_browsing::Scorer* scorer_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderViewPhishingScorerSetter);
-};
-
 }  // namespace
 
 // When we run plugins in process, we actually run them on the render thread,
 // which means that we need to make the render thread pump UI events.
 RenderThread::RenderThread() {
   Init();
 }
 
 RenderThread::RenderThread(const std::string& channel_name)
     : ChildThread(channel_name) {
@@ skipping 20 matching lines @@
   is_speech_input_enabled_ = false;
   suspend_webkit_shared_timer_ = true;
   notify_webkit_of_modal_loop_ = true;
   plugin_refresh_allowed_ = true;
   cache_stats_task_pending_ = false;
   widget_count_ = 0;
   hidden_widget_count_ = 0;
   idle_notification_delay_in_s_ = is_extension_process_ ?
       kInitialExtensionIdleHandlerDelayS : kInitialIdleHandlerDelayS;
   task_factory_.reset(new ScopedRunnableMethodFactory<RenderThread>(this));
-  callback_factory_.reset(new base::ScopedCallbackFactory<RenderThread>(this));
 
   visited_link_slave_.reset(new VisitedLinkSlave());
   user_script_slave_.reset(new UserScriptSlave(&extensions_));
   renderer_net_predictor_.reset(new RendererNetPredictor());
   histogram_snapshots_.reset(new RendererHistogramSnapshots());
   appcache_dispatcher_.reset(new AppCacheDispatcher(this));
   indexed_db_dispatcher_.reset(new IndexedDBDispatcher());
   spellchecker_.reset(new SpellCheck());
 
   devtools_agent_filter_ = new DevToolsAgentFilter();
@@ skipping 816 matching lines @@
   if (channel_handle.name.size() != 0) {
     // Connect to the GPU process if a channel name was received.
     gpu_channel_->Connect(channel_handle);
   } else {
     // Otherwise cancel the connection.
     gpu_channel_ = NULL;
   }
 }
 
 void RenderThread::OnSetPhishingModel(IPC::PlatformFileForTransit model_file) {
-  safe_browsing::Scorer::CreateFromFile(
-      IPC::PlatformFileForTransitToPlatformFile(model_file),
-      GetFileThreadMessageLoopProxy(),
-      callback_factory_->NewCallback(&RenderThread::PhishingScorerCreated));
-}
-
-void RenderThread::PhishingScorerCreated(safe_browsing::Scorer* scorer) {
-  if (!scorer) {
-    DLOG(ERROR) << "Unable to create a PhishingScorer - corrupt model?";
-    return;
-  }
-  phishing_scorer_.reset(scorer);
-  RenderViewPhishingScorerSetter setter(phishing_scorer_.get());
-  RenderView::ForEach(&setter);
+  safe_browsing::PhishingClassifierDelegate::SetPhishingModel(model_file);
 }
 
 scoped_refptr<base::MessageLoopProxy>
 RenderThread::GetFileThreadMessageLoopProxy() {
   DCHECK(message_loop() == MessageLoop::current());
   if (!file_thread_.get()) {
     file_thread_.reset(new base::Thread("Renderer::FILE"));
     file_thread_->Start();
   }
   return file_thread_->message_loop_proxy();
@@ skipping 19 matching lines @@
   }
 
   return false;
 }
 
 void RenderThread::RegisterExtension(v8::Extension* extension,
                                      bool restrict_to_extensions) {
   WebScriptController::registerExtension(extension);
   v8_extensions_[extension->name()] = restrict_to_extensions;
 }