Make RenderView not have to know about how PhishingClassifierDelegate.

chrome/renderer/render_view.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/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 569 matching lines @@
       pending_app_icon_requests_(0),
       session_storage_namespace_id_(session_storage_namespace_id) {
 #if defined(OS_MACOSX)
   // On Mac, the select popups are rendered by the browser.
   // Note that we don't do this in RenderMain otherwise this would not be called
   // in single-process mode.
   WebKit::WebView::setUseExternalPopupMenus(true);
 #endif
 
   ClearBlockedContentSettings();
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableClientSidePhishingDetection)) {
-    phishing_delegate_.reset(
-        new safe_browsing::PhishingClassifierDelegate(this, NULL));
-    RenderThread* thread = RenderThread::current();
-    if (thread && thread->phishing_scorer()) {
-      phishing_delegate_->SetPhishingScorer(thread->phishing_scorer());
-    }
-  }
 
   routing_id_ = routing_id;
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
   if (counter) {
     shared_popup_counter_ = counter;
     shared_popup_counter_->data++;
     decrement_shared_popup_at_destruction_ = true;
   } else {
@@ skipping 41 matching lines @@
   audio_message_filter_ = new AudioMessageFilter(routing_id_);
   render_thread_->AddFilter(audio_message_filter_);
 
   PageClickTracker* page_click_tracker = new PageClickTracker(this);
   // Note that the order of insertion of the listeners is important.
   // The password_autocomplete_manager takes the first shot at processing the
   // notification and can stop the propagation.
   page_click_tracker->AddListener(password_autofill_manager);
   page_click_tracker->AddListener(autofill_agent);
   new TranslateHelper(this);
+
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableClientSidePhishingDetection)) {
+    new safe_browsing::PhishingClassifierDelegate(this, NULL);
+  }
 }
 
 RenderView::~RenderView() {
   if (decrement_shared_popup_at_destruction_)
     shared_popup_counter_->data--;
 
   // If file chooser is still waiting for answer, dispatch empty answer.
   while (!file_chooser_completions_.empty()) {
     if (file_chooser_completions_.front()->completion) {
       file_chooser_completions_.front()->completion->didChooseFile(
@@ skipping 11 matching lines @@
   while (!fake_plugin_window_handles_.empty()) {
     // Make sure no NULL plugin window handles were inserted into this list.
     DCHECK(*fake_plugin_window_handles_.begin());
     // DestroyFakePluginWindowHandle modifies fake_plugin_window_handles_.
     DestroyFakePluginWindowHandle(*fake_plugin_window_handles_.begin());
   }
 #endif
 
   render_thread_->RemoveFilter(audio_message_filter_);
 
-  // Tell the PhishingClassifierDelegate that the view is going away.
-  if (phishing_delegate_.get())
-    phishing_delegate_->CancelPendingClassification();
-
 #ifndef NDEBUG
   // Make sure we are no longer referenced by the ViewMap.
   ViewMap* views = g_view_map.Pointer();
   for (ViewMap::iterator it = views->begin(); it != views->end(); ++it)
     DCHECK_NE(this, it->second) << "Failed to call Close?";
 #endif
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, set_render_view(NULL));
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, OnDestruct());
 }
@@ skipping 537 matching lines @@
   }
 
   // Generate the thumbnail here if the in-browser thumbnailing isn't
   // enabled. TODO(satorux): Remove this and related code once
   // crbug.com/65936 is complete.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableInBrowserThumbnailing)) {
     OnCaptureThumbnail();
   }
 
-  if (phishing_delegate_.get())
-    phishing_delegate_->FinishedLoad(&contents);
+  FOR_EACH_OBSERVER(RenderViewObserver, observers_, PageCaptured(contents));
 }
 
 void RenderView::CaptureText(WebFrame* frame, string16* contents) {
   contents->clear();
   if (!frame)
     return;
 
 #ifdef TIME_TEXT_RETRIEVAL
   double begin = time_util::GetHighResolutionTimeNow();
 #endif
@@ skipping 1412 matching lines @@
 
   // NOTE: initial_pos_ may still have its default values at this point, but
   // that's okay.  It'll be ignored if disposition is not NEW_POPUP, or the
   // browser process will impose a default position otherwise.
   Send(new ViewHostMsg_ShowView(opener_id_, routing_id_,
       NavigationPolicyToDisposition(policy), initial_pos_,
       opened_by_user_gesture_));
   SetPendingWindowRect(initial_pos_);
 }
 
-void RenderView::closeWidgetSoon() {
-  // Same for the phishing classifier.
-  if (phishing_delegate_.get())
-    phishing_delegate_->CancelPendingClassification();
-
-  if (script_can_close_)
-    RenderWidget::closeWidgetSoon();
-}
-
 void RenderView::runModal() {
   DCHECK(did_show_) << "should already have shown the view";
 
   // We must keep WebKit's shared timer running in this case in order to allow
   // showModalDialog to function properly.
   //
   // TODO(darin): WebKit should really be smarter about suppressing events and
   // timers so that we do not need to manage the shared timer in such a heavy
   // handed manner.
   //
@@ skipping 580 matching lines @@
         NavigationGestureUser : NavigationGestureAuto;
 
     // Make sure redirect tracking state is clear for the new load.
     completed_client_redirect_src_ = GURL();
   } else if (frame->parent()->isLoading()) {
     // Take note of AUTO_SUBFRAME loads here, so that we can know how to
     // load an error page.  See didFailProvisionalLoad.
     navigation_state->set_transition_type(PageTransition::AUTO_SUBFRAME);
   }
 
+  FOR_EACH_OBSERVER(
+      RenderViewObserver, observers_, DidStartProvisionalLoad(frame));
+
   Send(new ViewHostMsg_DidStartProvisionalLoadForFrame(
        routing_id_, frame->identifier(), is_top_most, ds->request().url()));
 }
 
 void RenderView::didReceiveServerRedirectForProvisionalLoad(WebFrame* frame) {
   if (frame->parent())
     return;
   // Received a redirect on the main frame.
   WebDataSource* data_source = frame->provisionalDataSource();
   if (!data_source) {
@@ skipping 15 matching lines @@
   //
   // Note: It is important this notification occur before DidStopLoading so the
   //       SSL manager can react to the provisional load failure before being
   //       notified the load stopped.
   //
   WebDataSource* ds = frame->provisionalDataSource();
   DCHECK(ds);
 
   const WebURLRequest& failed_request = ds->request();
 
+  FOR_EACH_OBSERVER(
+      RenderViewObserver, observers_, DidFailProvisionalLoad(frame, error));
+
   bool show_repost_interstitial =
       (error.reason == net::ERR_CACHE_MISS &&
        EqualsASCII(failed_request.httpMethod(), "POST"));
   Send(new ViewHostMsg_DidFailProvisionalLoadWithError(
       routing_id_, frame->identifier(), !frame->parent(), error.reason,
       error.unreachableURL, show_repost_interstitial));
 
   // Don't display an error page if this is simply a cancelled load.  Aside
   // from being dumb, WebCore doesn't expect it and it will cause a crash.
   if (error.reason == net::ERR_ABORTED)
@@ skipping 65 matching lines @@
 
   navigation_state->set_commit_load_time(Time::Now());
   if (is_new_navigation) {
     // When we perform a new navigation, we need to update the last committed
     // session history entry with state for the page we are leaving.
     UpdateSessionHistory(frame);
 
     // We bump our Page ID to correspond with the new session history entry.
     page_id_ = next_page_id_++;
 
-    // Let the phishing classifier decide whether to cancel classification.
-    if (phishing_delegate_.get())
-      phishing_delegate_->CommittedLoadInFrame(frame);
-
     // Advance our offset in session history, applying the length limit.  There
     // is now no forward history.
     history_list_offset_++;
     if (history_list_offset_ >= chrome::kMaxSessionHistoryEntries)
       history_list_offset_ = chrome::kMaxSessionHistoryEntries - 1;
     history_list_length_ = history_list_offset_ + 1;
 
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         page_info_method_factory_.NewRunnableMethod(
@@ skipping 14 matching lines @@
         navigation_state->pending_page_id() != page_id_ &&
         !navigation_state->request_committed()) {
       // This is a successful session history navigation!
       UpdateSessionHistory(frame);
       page_id_ = navigation_state->pending_page_id();
 
       history_list_offset_ = navigation_state->pending_history_list_offset();
     }
   }
 
+  FOR_EACH_OBSERVER(RenderViewObserver, observers_,
+                    DidCommitProvisionalLoad(frame, is_new_navigation));
+
   // Remember that we've already processed this request, so we don't update
   // the session history again.  We do this regardless of whether this is
   // a session history navigation, because if we attempted a session history
   // navigation without valid HistoryItem state, WebCore will think it is a
   // new navigation.
   navigation_state->set_request_committed(true);
 
   UpdateURL(frame);
 
   // If this committed load was initiated by a client redirect, we're
@@ skipping 54 matching lines @@
 }
 
 void RenderView::didFinishDocumentLoad(WebFrame* frame) {
   WebDataSource* ds = frame->dataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
   DCHECK(navigation_state);
   navigation_state->set_finish_document_load_time(Time::Now());
 
   Send(new ViewHostMsg_DocumentLoadedInFrame(routing_id_, frame->identifier()));
 
-  FOR_EACH_OBSERVER(
-      RenderViewObserver, observers_, DidFinishDocumentLoad(frame));
+  FOR_EACH_OBSERVER(RenderViewObserver, observers_,
+                    DidFinishDocumentLoad(frame));
 
   // Check whether we have new encoding name.
   UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
 
   if (RenderThread::current()) {  // Will be NULL during unit tests.
     RenderThread::current()->user_script_slave()->InjectScripts(
         frame, UserScript::DOCUMENT_END);
   }
 
   // InjectScripts() can end up creating a new NavigationState if it triggers a
@@ skipping 20 matching lines @@
 }
 
 void RenderView::didHandleOnloadEvents(WebFrame* frame) {
   if (webview()->mainFrame() == frame) {
     Send(new ViewHostMsg_DocumentOnLoadCompletedInMainFrame(routing_id_,
                                                             page_id_));
   }
 }
 
 void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) {
-  // Ignore
+  FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidFailLoad(frame, error));
 }
 
 void RenderView::didFinishLoad(WebFrame* frame) {
   WebDataSource* ds = frame->dataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
   DCHECK(navigation_state);
   navigation_state->set_finish_load_time(Time::Now());
   navigation_state->user_script_idle_scheduler()->DidFinishLoad();
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidFinishLoad(frame));
@@ skipping 2202 matching lines @@
   }
 }
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }