Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(373)

Unified Diff: chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc

Issue 2668003004: Convert extensions::TabHelper to use the new navigation callbacks. (Closed)
Patch Set: update Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc
index a719121d03032241c2402cf1cfb70fc62eb8bfda..957612ceac2b57b29186728cda3c986dff183dbc 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h"
#include "components/url_matcher/url_matcher.h"
#include "content/public/browser/navigation_controller.h"
-#include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/web_contents.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -252,8 +252,10 @@ TEST_F(DeclarativeContentPageUrlConditionTrackerTest,
// evaluation request.
LoadURL(tab.get(), GURL("http://test1/"));
delegate_.evaluation_requests().clear();
- tracker_.OnWebContentsNavigation(tab.get(), content::LoadCommittedDetails(),
- content::FrameNavigateParams());
+ std::unique_ptr<content::NavigationHandle> navigation_handle =
+ content::NavigationHandle::CreateNavigationHandleForTesting(
+ GURL(), tab->GetMainFrame(), true);
+ tracker_.OnWebContentsNavigation(tab.get(), navigation_handle.get());
EXPECT_THAT(delegate_.evaluation_requests(),
UnorderedElementsAre(tab.get()));
@@ -261,8 +263,7 @@ TEST_F(DeclarativeContentPageUrlConditionTrackerTest,
// URL results in an evaluation request.
LoadURL(tab.get(), GURL("http://test1/a"));
delegate_.evaluation_requests().clear();
- tracker_.OnWebContentsNavigation(tab.get(), content::LoadCommittedDetails(),
- content::FrameNavigateParams());
+ tracker_.OnWebContentsNavigation(tab.get(), navigation_handle.get());
EXPECT_THAT(delegate_.evaluation_requests(),
UnorderedElementsAre(tab.get()));
@@ -270,8 +271,7 @@ TEST_F(DeclarativeContentPageUrlConditionTrackerTest,
// URL results in an evaluation request.
delegate_.evaluation_requests().clear();
LoadURL(tab.get(), GURL("http://test2/"));
- tracker_.OnWebContentsNavigation(tab.get(), content::LoadCommittedDetails(),
- content::FrameNavigateParams());
+ tracker_.OnWebContentsNavigation(tab.get(), navigation_handle.get());
EXPECT_THAT(delegate_.evaluation_requests(),
UnorderedElementsAre(tab.get()));
@@ -279,8 +279,7 @@ TEST_F(DeclarativeContentPageUrlConditionTrackerTest,
// non-matching URL results in an evaluation request.
delegate_.evaluation_requests().clear();
LoadURL(tab.get(), GURL("http://test2/a"));
- tracker_.OnWebContentsNavigation(tab.get(), content::LoadCommittedDetails(),
- content::FrameNavigateParams());
+ tracker_.OnWebContentsNavigation(tab.get(), navigation_handle.get());
EXPECT_THAT(delegate_.evaluation_requests(),
UnorderedElementsAre(tab.get()));

Powered by Google App Engine
This is Rietveld 408576698