Clean up a few TODO items.

chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc

 // Copyright (c) 2012 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/browser/safe_browsing/browser_feature_extractor.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 82 matching lines @@
   // allows us to specify the referrer and page_transition_type.
   void NavigateAndCommit(const GURL& url,
                          const GURL& referrer,
                          content::PageTransition type) {
     contents()->GetController().LoadURL(
         url, content::Referrer(referrer, WebKit::WebReferrerPolicyDefault),
         type, std::string());
 
     static int page_id = 0;
     content::RenderViewHost* rvh =
-        WebContentsTester::For(contents())->pending_rvh();
+        WebContentsTester::For(contents())->GetPendingRenderViewHost();
     if (!rvh) {
       rvh = contents()->GetRenderViewHost();
     }
     WebContentsTester::For(contents())->ProceedWithCrossSiteNavigation();
     WebContentsTester::For(contents())->TestDidNavigateWithReferrer(
         rvh, ++page_id, url,
         content::Referrer(referrer, WebKit::WebReferrerPolicyDefault), type);
   }
 
   bool ExtractFeatures(ClientPhishingRequest* request) {
@@ skipping 385 matching lines @@
   EXPECT_TRUE(features.count(StringPrintf("%s%s",
                                           features::kSafeBrowsingMaliciousUrl,
                                           "http://www.malware.com/")));
   EXPECT_TRUE(features.count(StringPrintf("%s%s",
                                           features::kSafeBrowsingOriginalUrl,
                                           "http://www.good.com/")));
   EXPECT_DOUBLE_EQ(1.0, features[features::kSafeBrowsingIsSubresource]);
   EXPECT_DOUBLE_EQ(2.0, features[features::kSafeBrowsingThreatType]);
 }
 }  // namespace safe_browsing