Commit 6797f88b authored by Sergio Collazos's avatar Sergio Collazos Committed by Commit Bot

Revert "[iOS] Restore the user agent only on iOS 13+"

This reverts commit 21eb2224.

Reason for revert: Causing failures on ios_web_unittests on iOS12

https://ci.chromium.org/p/chrome/builders/ci/iphone-device/7949

Original change's description:
> [iOS] Restore the user agent only on iOS 13+
> 
> This CL restrict the user agent restoration to iOS 13 and further as
> iOS 12 has an issue getting the right User Agent.
> 
> Bug: 1070593
> Change-Id: Ie4570efcb9931ccb8662511b16a1298570f0a297
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2154189
> Reviewed-by: Justin Cohen <justincohen@chromium.org>
> Commit-Queue: Gauthier Ambard <gambard@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#760057}

TBR=justincohen@chromium.org,gambard@chromium.org

Change-Id: I0458f2cea4df855599dd8fa72692b7ff4840ef06
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1070593
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153733Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760192}
parent 078d5fa1
...@@ -741,16 +741,12 @@ void WKBasedNavigationManagerImpl::UnsafeRestore( ...@@ -741,16 +741,12 @@ void WKBasedNavigationManagerImpl::UnsafeRestore(
forward_items.push_back(std::move(items[index])); forward_items.push_back(std::move(items[index]));
} }
if (@available(iOS 13, *)) { AddRestoreCompletionCallback(base::BindOnce(
AddRestoreCompletionCallback( &WKBasedNavigationManagerImpl::RestoreItemsState, base::Unretained(this),
base::BindOnce(&WKBasedNavigationManagerImpl::RestoreItemsState, RestoreItemListType::kBackList, std::move(back_items)));
base::Unretained(this), RestoreItemListType::kBackList, AddRestoreCompletionCallback(base::BindOnce(
std::move(back_items))); &WKBasedNavigationManagerImpl::RestoreItemsState, base::Unretained(this),
AddRestoreCompletionCallback(base::BindOnce( RestoreItemListType::kForwardList, std::move(forward_items)));
&WKBasedNavigationManagerImpl::RestoreItemsState,
base::Unretained(this), RestoreItemListType::kForwardList,
std::move(forward_items)));
}
LoadURLWithParams(params); LoadURLWithParams(params);
...@@ -799,10 +795,8 @@ void WKBasedNavigationManagerImpl::RestoreItemsState( ...@@ -799,10 +795,8 @@ void WKBasedNavigationManagerImpl::RestoreItemsState(
void WKBasedNavigationManagerImpl::RestoreVisibleItemState() { void WKBasedNavigationManagerImpl::RestoreVisibleItemState() {
NavigationItemImpl* last_committed_item = NavigationItemImpl* last_committed_item =
GetLastCommittedItemInCurrentOrRestoredSession(); GetLastCommittedItemInCurrentOrRestoredSession();
if (@available(iOS 13, *)) { if (restored_visible_item_ && last_committed_item) {
if (restored_visible_item_ && last_committed_item) { last_committed_item->RestoreStateFromItem(restored_visible_item_.get());
last_committed_item->RestoreStateFromItem(restored_visible_item_.get());
}
} }
restored_visible_item_.reset(); restored_visible_item_.reset();
} }
......
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