Make RenderView not have to know about how PhishingClassifierDelegate.

chrome/renderer/safe_browsing/phishing_dom_feature_extractor.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/safe_browsing/phishing_dom_feature_extractor.h"
 
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 128 matching lines @@
 }
 
 void PhishingDOMFeatureExtractor::ExtractFeaturesWithTimeout() {
   DCHECK(page_feature_state_.get());
   ++page_feature_state_->num_iterations;
   base::TimeTicks current_chunk_start_time = clock_->Now();
 
   if (!cur_frame_) {
     WebKit::WebView* web_view = render_view_->webview();
     if (!web_view) {
-      // When the WebView is going away, the render view should have called
-      // CancelPendingExtraction() which should have stopped any pending work,
-      // so this case should not happen.
-      NOTREACHED();
-      RunCallback(false);
+      RunCallback(false);  // The WebView is going away.

[Brian Ryner, 2011/02/07 20:08:19]

We're not using it currently, but there is a similar NOTREACHED in
phishing_thumbnailer.cc.  Could you fix that one as well?

[jam, 2011/02/07 20:24:49]

Done.

       return;
     }
     cur_frame_ = web_view->mainFrame();
   }
 
   int num_elements = 0;
   for (; cur_frame_;
        cur_frame_ = cur_frame_->traverseNext(false /* don't wrap around */)) {
     WebKit::WebNode cur_node;
     if (cur_frame_data_.get()) {
@@ skipping 316 matching lines @@
   // Record number of script tags (discretized for numerical stability.)
   if (page_feature_state_->num_script_tags > 1) {
     features_->AddBooleanFeature(features::kPageNumScriptTagsGTOne);
     if (page_feature_state_->num_script_tags > 6) {
       features_->AddBooleanFeature(features::kPageNumScriptTagsGTSix);
     }
   }
 }
 
 }  // namespace safe_browsing