Revert of Classify navigations without page id in parallel to the existing classifier.

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>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/browser_features.h"
 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
 #include "chrome/browser/safe_browsing/database_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.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 "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/navigation_controller.h"
-#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
@@ skipping 87 matching lines @@
   }
 
   // This is similar to NavigateAndCommit that is in WebContentsTester, but
   // allows us to specify the referrer and page_transition_type.
   void NavigateAndCommit(const GURL& url,
                          const GURL& referrer,
                          ui::PageTransition type) {
     web_contents()->GetController().LoadURL(
         url, content::Referrer(referrer, blink::WebReferrerPolicyDefault),
         type, std::string());
-    int pending_id =
-        web_contents()->GetController().GetPendingEntry()->GetUniqueID();
 
     static int page_id = 0;
     content::RenderFrameHost* rfh =
         WebContentsTester::For(web_contents())->GetPendingMainFrame();
     if (!rfh) {
       rfh = web_contents()->GetMainFrame();
     }
     WebContentsTester::For(web_contents())->ProceedWithCrossSiteNavigation();
     WebContentsTester::For(web_contents())->TestDidNavigateWithReferrer(
-        rfh, ++page_id, pending_id, true, url,
+        rfh, ++page_id, url,
         content::Referrer(referrer, blink::WebReferrerPolicyDefault), type);
   }
 
   bool ExtractFeatures(ClientPhishingRequest* request) {
     StartExtractFeatures(request);
     base::MessageLoop::current()->Run();
     EXPECT_EQ(1U, success_.count(request));
     return success_.count(request) ? success_[request] : false;
   }
 
@@ skipping 495 matching lines @@
     // First ip is good but all the others are bad.
     EXPECT_CALL(*db_manager_, MatchMalwareIP(ip)).WillOnce(Return(i > 0));
   }
 
   ExtractMalwareFeatures(&request);
   // The number of IP matched url we store is capped at 5 IPs per request.
   EXPECT_EQ(5, request.bad_ip_url_info_size());
 }
 
 }  // namespace safe_browsing