Revert 113006 - Make TestTabContents::TestDidNavigate not take a ViewHostMsg_FrameNavigate_Params...

chrome/browser/safe_browsing/browser_feature_extractor_unittest.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/browser/safe_browsing/browser_feature_extractor.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/browser_features.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
+#include "content/common/view_messages.h"
 #include "content/public/common/page_transition_types.h"
-#include "content/public/common/referrer.h"
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebReferrerPolicy.h"
 
 using ::testing::Return;
 using ::testing::StrictMock;
 using content::BrowserThread;
 
 namespace safe_browsing {
 namespace {
 class MockClientSideDetectionService : public ClientSideDetectionService {
  public:
   MockClientSideDetectionService() : ClientSideDetectionService(NULL) {}
@@ skipping 49 matching lines @@
   // This is similar to NavigateAndCommit that is in test_tab_contents, but
   // allows us to specify the referrer and page_transition_type.
   void NavigateAndCommit(const GURL& url,
                          const GURL& referrer,
                          content::PageTransition type) {
     contents()->controller().LoadURL(
         url, content::Referrer(referrer, WebKit::WebReferrerPolicyDefault),
         type, std::string());
 
     static int page_id = 0;
+    ViewHostMsg_FrameNavigate_Params params;
+    InitNavigateParams(&params, ++page_id, url, type);
+    params.referrer =
+        content::Referrer(referrer, WebKit::WebReferrerPolicyDefault);
+
     RenderViewHost* rvh = contents()->pending_rvh();
     if (!rvh) {
       rvh = contents()->render_view_host();
     }
     contents()->ProceedWithCrossSiteNavigation();
-    contents()->TestDidNavigateWithReferrer(
-        rvh, ++page_id, url,
-        content::Referrer(referrer, WebKit::WebReferrerPolicyDefault), type);
+    contents()->TestDidNavigate(rvh, params);
   }
 
   bool ExtractFeatures(ClientPhishingRequest* request) {
     StartExtractFeatures(request);
     MessageLoop::current()->Run();
     EXPECT_EQ(1U, success_.count(request));
     return success_.count(request) ? success_[request] : false;
   }
 
   void StartExtractFeatures(ClientPhishingRequest* request) {
@@ skipping 378 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