Revert "Replace the NTP Interceptor with Throttle"
This reverts commit 9019d6765f35c87f22e1144421f3aceaf5962417.
Reason for revert: The test still seems to fail on various bots, see e.g. crbug.com/814545
Original change's description:
> Replace the NTP Interceptor with Throttle
>
> This change replaces the NewTabPageInterceptorService with a
> NewTabPageNavigationThrottle. The throttle reduces complexity, but it
> is also neutral regarding the network stack / network service, so it
> fixes the NewTabPageInterceptorServiceTests that were broken with the
> NetworkService feature enabled. These tests are now renamed
> NewTabPageNavigationThrottleTest.
>
> This reverts commit 0f77672dd3f34d5ba2e96912d34d657deb8f7433.
>
> Issues with the previous version of the commit have been fixed by modifying
> the affected tests to handle redirection appropriately when
> features::kUseGoogleLocalNtp is not enabled.
>
> BUG=802926,804055,808011
>
> Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
> Change-Id: Iec3a11c6454633860728f76564e10406ec0a9cbd
> Reviewed-on: https://chromium-review.googlesource.com/920461
> Reviewed-by: Marc Treib <[email protected]>
> Reviewed-by: Maksim Ivanov <[email protected]>
> Reviewed-by: Tommy Martino <[email protected]>
> Reviewed-by: Trent Apted <[email protected]>
> Reviewed-by: Bernhard Bauer <[email protected]>
> Reviewed-by: Reilly Grant <[email protected]>
> Commit-Queue: Conley Owens <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#538197}
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
Change-Id: I65df1f24e4cdcc5d3ee8845fa64b669153819ec3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 802926, 804055, 808011
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Reviewed-on: https://chromium-review.googlesource.com/932081
Reviewed-by: Nico Weber <[email protected]>
Reviewed-by: Conley Owens <[email protected]>
Commit-Queue: Nico Weber <[email protected]>
Cr-Commit-Position: refs/heads/master@{#538485}diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
index c9ee6ba..fa788bd 100644
--- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
+++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/location_bar/location_bar.h"
-#include "chrome/browser/ui/search/local_ntp_test_utils.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h"
#include "chrome/common/url_constants.h"
@@ -73,12 +72,7 @@
void TestURLNotShown(const GURL& url) {
ui_test_utils::NavigateToURL(browser(), url);
EXPECT_EQ("", GetLocationBarText());
- if (url == chrome::kChromeUINewTabURL) {
- EXPECT_EQ(local_ntp_test_utils::GetFinalNtpUrl(browser()->profile()),
- GetNavigationEntry()->GetVirtualURL());
- } else {
- EXPECT_EQ(url, GetNavigationEntry()->GetVirtualURL());
- }
+ EXPECT_EQ(url, GetNavigationEntry()->GetVirtualURL());
}
};
