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

chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc

 // Copyright 2013 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/test_generated_credit_card_bubble_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
-#include "content/public/browser/navigation_details.h"
-#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/gfx/range/range.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
@@ skipping 41 matching lines @@
         ::prefs::kAutofillGeneratedCardBubbleTimesShown);
   }
 
   void Show() {
     ASSERT_TRUE(controller()->IsInstalled());
     TestGeneratedCreditCardBubbleController::Show(test_web_contents_.get(),
                                                   FrontingCard(),
                                                   BackingCard());
   }
 
-  void NavigateWithTransition(ui::PageTransition transition) {
-    content::LoadCommittedDetails details;
-    content::FrameNavigateParams params;
-
-    // The transition is in two places; fill in both.
-    scoped_ptr<content::NavigationEntry> navigation_entry(
-        content::NavigationEntry::Create());
-    navigation_entry->SetTransitionType(transition);
-    params.transition = transition;
-    details.entry = navigation_entry.get();
-
-    ASSERT_NE(nullptr, controller());
-    controller()->DidNavigateMainFrame(details, params);
+  void NavigateWithTransition(ui::PageTransition trans) {
+    content::WebContentsTester::For(test_web_contents_.get())->TestDidNavigate(
+        test_web_contents_->GetMainFrame(), 1, GURL("about:blank"), trans);
   }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
 #if defined(OS_WIN)
   // Without this there will be drag and drop failures. http://crbug.com/227221
   ui::ScopedOleInitializer ole_initializer_;
 #endif
   TestingProfile profile_;
   scoped_ptr<content::WebContents> test_web_contents_;
@@ skipping 75 matching lines @@
 
   // If the user reloads or the page redirects or submits a form, the bubble
   // should stay showing.
   NavigateWithTransition(ui::PAGE_TRANSITION_CLIENT_REDIRECT);
   NavigateWithTransition(ui::PAGE_TRANSITION_FORM_SUBMIT);
   NavigateWithTransition(ui::PAGE_TRANSITION_RELOAD);
   EXPECT_TRUE(controller()->GetTestingBubble()->showing());
 }
 
 }  // namespace autofill