Commit c99f13fc authored by mrefaat's avatar mrefaat Committed by Commit Bot

Remove the usage of Tab from AppLauncherTabHelper

tab.browserState used to get the ReadingListModel, So instead use
webState to get ChromeBrowserState which can be used to get ReadingListModel

Bug: 902044
Change-Id: I66d84993e9d74f301b872e53c2b09dd75a106463
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1504496
Commit-Queue: Mohammad Refaat <mrefaat@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638392}
parent 8a62ae78
...@@ -20,8 +20,8 @@ source_set("app_launcher") { ...@@ -20,8 +20,8 @@ source_set("app_launcher") {
"//base", "//base",
"//components/reading_list/core:core", "//components/reading_list/core:core",
"//ios/chrome/browser", "//ios/chrome/browser",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/reading_list", "//ios/chrome/browser/reading_list",
"//ios/chrome/browser/tabs",
"//ios/chrome/browser/u2f", "//ios/chrome/browser/u2f",
"//ios/web/public", "//ios/web/public",
"//url", "//url",
...@@ -56,7 +56,6 @@ source_set("unit_tests") { ...@@ -56,7 +56,6 @@ source_set("unit_tests") {
"//ios/chrome/browser", "//ios/chrome/browser",
"//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/reading_list", "//ios/chrome/browser/reading_list",
"//ios/chrome/browser/tabs",
"//ios/chrome/browser/u2f", "//ios/chrome/browser/u2f",
"//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web:tab_id_tab_helper",
"//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web:web_internal",
......
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
#import "ios/chrome/browser/app_launcher/app_launcher_abuse_detector.h" #import "ios/chrome/browser/app_launcher/app_launcher_abuse_detector.h"
#include "ios/chrome/browser/app_launcher/app_launcher_flags.h" #include "ios/chrome/browser/app_launcher/app_launcher_flags.h"
#import "ios/chrome/browser/app_launcher/app_launcher_tab_helper_delegate.h" #import "ios/chrome/browser/app_launcher/app_launcher_tab_helper_delegate.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/chrome_url_util.h" #import "ios/chrome/browser/chrome_url_util.h"
#include "ios/chrome/browser/reading_list/reading_list_model_factory.h" #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
#import "ios/chrome/browser/tabs/legacy_tab_helper.h"
#import "ios/chrome/browser/tabs/tab.h"
#import "ios/chrome/browser/u2f/u2f_tab_helper.h" #import "ios/chrome/browser/u2f/u2f_tab_helper.h"
#import "ios/web/public/navigation_item.h" #import "ios/web/public/navigation_item.h"
#import "ios/web/public/navigation_manager.h" #import "ios/web/public/navigation_manager.h"
...@@ -216,7 +215,8 @@ bool AppLauncherTabHelper::ShouldAllowRequest( ...@@ -216,7 +215,8 @@ bool AppLauncherTabHelper::ShouldAllowRequest(
bool is_link_transition = ui::PageTransitionTypeIncludingQualifiersIs( bool is_link_transition = ui::PageTransitionTypeIncludingQualifiersIs(
request_info.transition_type, ui::PAGE_TRANSITION_LINK); request_info.transition_type, ui::PAGE_TRANSITION_LINK);
Tab* tab = LegacyTabHelper::GetTabForWebState(web_state_); ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState());
if (base::FeatureList::IsEnabled(kAppLauncherRefresh)) { if (base::FeatureList::IsEnabled(kAppLauncherRefresh)) {
if (!is_link_transition && original_pending_url.is_valid()) { if (!is_link_transition && original_pending_url.is_valid()) {
...@@ -224,7 +224,7 @@ bool AppLauncherTabHelper::ShouldAllowRequest( ...@@ -224,7 +224,7 @@ bool AppLauncherTabHelper::ShouldAllowRequest(
// was a redirection, the |source_url| may not have been reported to // was a redirection, the |source_url| may not have been reported to
// ReadingListWebStateObserver. Report it to mark as read if needed. // ReadingListWebStateObserver. Report it to mark as read if needed.
ReadingListModel* model = ReadingListModel* model =
ReadingListModelFactory::GetForBrowserState(tab.browserState); ReadingListModelFactory::GetForBrowserState(browser_state);
if (model && model->loaded()) if (model && model->loaded())
model->SetReadStatus(original_pending_url, true); model->SetReadStatus(original_pending_url, true);
} }
...@@ -244,7 +244,7 @@ bool AppLauncherTabHelper::ShouldAllowRequest( ...@@ -244,7 +244,7 @@ bool AppLauncherTabHelper::ShouldAllowRequest(
// entry as read if needed. // entry as read if needed.
if (original_pending_url.is_valid()) { if (original_pending_url.is_valid()) {
ReadingListModel* model = ReadingListModel* model =
ReadingListModelFactory::GetForBrowserState(tab.browserState); ReadingListModelFactory::GetForBrowserState(browser_state);
if (model && model->loaded()) if (model && model->loaded())
model->SetReadStatus(original_pending_url, true); model->SetReadStatus(original_pending_url, true);
} }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h" #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/chrome_url_util.h" #import "ios/chrome/browser/chrome_url_util.h"
#include "ios/chrome/browser/reading_list/reading_list_model_factory.h" #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
#import "ios/chrome/browser/tabs/legacy_tab_helper.h"
#import "ios/chrome/browser/u2f/u2f_tab_helper.h" #import "ios/chrome/browser/u2f/u2f_tab_helper.h"
#import "ios/chrome/browser/web/tab_id_tab_helper.h" #import "ios/chrome/browser/web/tab_id_tab_helper.h"
#import "ios/web/public/test/fakes/test_navigation_manager.h" #import "ios/web/public/test/fakes/test_navigation_manager.h"
...@@ -143,7 +142,6 @@ class AppLauncherTabHelperTest : public PlatformTest { ...@@ -143,7 +142,6 @@ class AppLauncherTabHelperTest : public PlatformTest {
chrome_browser_state_.get(), chrome_browser_state_.get(),
base::BindRepeating(&BuildReadingListModel)); base::BindRepeating(&BuildReadingListModel));
TabIdTabHelper::CreateForWebState(&web_state_); TabIdTabHelper::CreateForWebState(&web_state_);
LegacyTabHelper::CreateForWebState(&web_state_);
is_reading_list_initialized_ = true; is_reading_list_initialized_ = true;
} }
...@@ -312,7 +310,6 @@ TEST_F(AppLauncherTabHelperTest, InsecureUrls) { ...@@ -312,7 +310,6 @@ TEST_F(AppLauncherTabHelperTest, InsecureUrls) {
TEST_F(AppLauncherTabHelperTest, U2FUrls) { TEST_F(AppLauncherTabHelperTest, U2FUrls) {
// Add required tab helpers for the U2F check. // Add required tab helpers for the U2F check.
TabIdTabHelper::CreateForWebState(&web_state_); TabIdTabHelper::CreateForWebState(&web_state_);
LegacyTabHelper::CreateForWebState(&web_state_);
std::unique_ptr<web::NavigationItem> item = web::NavigationItem::Create(); std::unique_ptr<web::NavigationItem> item = web::NavigationItem::Create();
// "u2f-x-callback" scheme should only be created by the browser. External // "u2f-x-callback" scheme should only be created by the browser. External
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment