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

chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_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/extensions/api/declarative_content/chrome_content_rules_registry.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/api/declarative_content/content_predicate.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace {
 
 class TestPredicateEvaluator;
@@ skipping 44 matching lines @@
       const std::vector<const void*>& predicate_groups) override {
     RequestEvaluationIfSpecified();
   }
 
   void TrackForWebContents(content::WebContents* contents) override {
     RequestEvaluationIfSpecified();
   }
 
   void OnWebContentsNavigation(
       content::WebContents* contents,
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) override {
+      content::NavigationHandle* navigation_handle) override {
     RequestEvaluationIfSpecified();
   }
 
   bool EvaluatePredicate(const ContentPredicate* predicate,
                          content::WebContents* tab) const override {
     bool result = next_evaluation_result_;
     next_evaluation_result_ = false;
     return result;
   }
 
@@ skipping 52 matching lines @@
   TestPredicateEvaluator* evaluator = nullptr;
   scoped_refptr<ChromeContentRulesRegistry> registry(
       new ChromeContentRulesRegistry(env()->profile(), nullptr,
                                      base::Bind(&CreateTestEvaluator,
                                                 &evaluator)));
 
   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());
+  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.
   linked_ptr<api::events::Rule> rule(new api::events::Rule);
   api::events::Rule::Populate(
       *base::test::ParseJson(
           "{\n"
           "  \"id\": \"rule1\",\n"
           "  \"priority\": 100,\n"
           "  \"conditions\": [\n"
           "    {\n"
           "      \"instanceType\": \"declarativeContent.PageStateMatcher\",\n"
           "      \"test_predicate\": []\n"
           "    }],\n"
           "  \"actions\": [\n"
           "    { \"instanceType\": \"declarativeContent.ShowPageAction\" }\n"
           "  ]\n"
           "}"),
       rule.get());
   std::vector<linked_ptr<api::events::Rule>> rules;
   rules.push_back(rule);
 
   const Extension* extension = env()->MakeExtension(*base::test::ParseJson(
       "{\"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);
   EXPECT_EQ(1u, registry->GetActiveRulesCountForTesting());
 
   // Closing the tab should erase its entry from active_rules_.
   tab.reset();
   EXPECT_EQ(0u, registry->GetActiveRulesCountForTesting());
 
   tab = env()->MakeTab();
   registry->MonitorWebContentsForRuleEvaluation(tab.get());
   evaluator->RequestImmediateEvaluation(tab.get(), true);
   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