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

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

 // Copyright 2015 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/declarative_content_css_condition_tracker.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/declarative_content/content_constants.h"
 #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h"
 #include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/common/extension_messages.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace extensions {
 
 namespace {
@@ skipping 63 matching lines @@
     : WebContentsObserver(contents),
       request_evaluation_(request_evaluation),
       web_contents_destroyed_(web_contents_destroyed) {
 }
 
 DeclarativeContentCssConditionTracker::PerWebContentsTracker::
 ~PerWebContentsTracker() {
 }
 
 void DeclarativeContentCssConditionTracker::PerWebContentsTracker::
-OnWebContentsNavigation(const content::LoadCommittedDetails& details,
-                        const content::FrameNavigateParams& params) {
-  if (details.is_in_page) {
+OnWebContentsNavigation(content::NavigationHandle* navigation_handle) {
+  if (navigation_handle->IsSamePage()) {
     // Within-page navigations don't change the set of elements that
     // exist, and we only support filtering on the top-level URL, so
     // this can't change which rules match.
     return;
   }
 
   // Top-level navigation produces a new document. Initially, the
   // document's empty, so no CSS rules match.  The renderer will send
   // an ExtensionHostMsg_OnWatchedPageChange later if any CSS rules
   // match.
@@ skipping 111 matching lines @@
           base::Bind(&Delegate::RequestEvaluation, base::Unretained(delegate_)),
           base::Bind(&DeclarativeContentCssConditionTracker::
                      DeletePerWebContentsTracker,
                      base::Unretained(this))));
   // Note: the condition is always false until we receive OnWatchedPageChange,
   // so there's no need to evaluate it here.
 }
 
 void DeclarativeContentCssConditionTracker::OnWebContentsNavigation(
     content::WebContents* contents,
-    const content::LoadCommittedDetails& details,
-    const content::FrameNavigateParams& params) {
+    content::NavigationHandle* navigation_handle) {
   DCHECK(base::ContainsKey(per_web_contents_tracker_, contents));
-  per_web_contents_tracker_[contents]->OnWebContentsNavigation(details, params);
+  per_web_contents_tracker_[contents]->OnWebContentsNavigation(
+      navigation_handle);
 }
 
 bool DeclarativeContentCssConditionTracker::EvaluatePredicate(
     const ContentPredicate* predicate,
     content::WebContents* tab) const {
   DCHECK_EQ(this, predicate->GetEvaluator());
   const DeclarativeContentCssPredicate* typed_predicate =
       static_cast<const DeclarativeContentCssPredicate*>(predicate);
   auto loc = per_web_contents_tracker_.find(tab);
   DCHECK(loc != per_web_contents_tracker_.end());
@@ skipping 53 matching lines @@
   }
 }
 
 void DeclarativeContentCssConditionTracker::DeletePerWebContentsTracker(
     content::WebContents* contents) {
   DCHECK(base::ContainsKey(per_web_contents_tracker_, contents));
   per_web_contents_tracker_.erase(contents);
 }
 
 }  // namespace extensions