Convert extensions::TabHelper to use the new navigation callbacks.

chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc

Index: chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
index 7dff9dea1ea48b609278f9002dbee07e0b515872..66c762ec989583531994c5038adf825ff94ecf11 100644
--- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "extensions/common/extension.h"
@@ -77,8 +77,7 @@ class TestPredicateEvaluator : public ContentPredicateEvaluator {
 
   void OnWebContentsNavigation(
       content::WebContents* contents,
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) override {
+      content::NavigationHandle* navigation_handle) override {
     RequestEvaluationIfSpecified();
   }
 
@@ -150,9 +149,12 @@ TEST_F(DeclarativeChromeContentRulesRegistryTest, ActiveRulesDoesntGrow) {
   EXPECT_EQ(0u, registry->GetActiveRulesCountForTesting());
 
   std::unique_ptr<content::WebContents> tab = env()->MakeTab();
-  registry->MonitorWebContentsForRuleEvaluation(tab.get());
-  registry->DidNavigateMainFrame(tab.get(), content::LoadCommittedDetails(),
-                                 content::FrameNavigateParams());
+  registry->MonitorWebContentsForRuleEvaluation(tab.get());
+  std::unique_ptr<content::NavigationHandle> navigation_handle =
+      content::NavigationHandle::CreateNavigationHandleForTesting(
+          GURL(), tab->GetMainFrame(), true);
+
+  registry->DidFinishNavigation(tab.get(), navigation_handle.get());
   EXPECT_EQ(0u, registry->GetActiveRulesCountForTesting());
 
   // Add a rule.
@@ -179,8 +181,7 @@ TEST_F(DeclarativeChromeContentRulesRegistryTest, ActiveRulesDoesntGrow) {
       "{\"page_action\": {}}"));
   registry->AddRulesImpl(extension->id(), rules);
 
-  registry->DidNavigateMainFrame(tab.get(), content::LoadCommittedDetails(),
-                                 content::FrameNavigateParams());
+  registry->DidFinishNavigation(tab.get(), navigation_handle.get());
   EXPECT_EQ(0u, registry->GetActiveRulesCountForTesting());
 
   evaluator->RequestImmediateEvaluation(tab.get(), true);
@@ -196,9 +197,10 @@ TEST_F(DeclarativeChromeContentRulesRegistryTest, ActiveRulesDoesntGrow) {
   EXPECT_EQ(1u, registry->GetActiveRulesCountForTesting());
 
   evaluator->RequestEvaluationOnNextOperation(tab.get(), false);
-  registry->DidNavigateMainFrame(tab.get(), content::LoadCommittedDetails(),
-                                 content::FrameNavigateParams());
+  registry->DidFinishNavigation(tab.get(), navigation_handle.get());
   EXPECT_EQ(0u, registry->GetActiveRulesCountForTesting());
+
+  navigation_handle.reset(); // So that it's destructor doesn't call |tab|.

[Devlin, 2017/02/01 23:18:21]

That's weird - shouldn't this be destroyed first already, since it's allocated
higher on the stack?

[jam, 2017/02/01 23:48:49]

Fixed (my initial attempt was a misreading as you noted and I hastily sent it
for review while verifying!).

 }
 
 }  // namespace extensions