summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/all_urls_apitest.cc
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-15 23:11:06 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-15 23:11:06 +0000
commit19506d546af1218583787ebe2dcffce5cae3243d (patch)
tree945f30b6d0a79b04dbd8d9b42080d934809596ce /chrome/browser/extensions/all_urls_apitest.cc
parent30cb70c5115351519b2cc1ad6173803be16b591d (diff)
downloadchromium_src-19506d546af1218583787ebe2dcffce5cae3243d.zip
chromium_src-19506d546af1218583787ebe2dcffce5cae3243d.tar.gz
chromium_src-19506d546af1218583787ebe2dcffce5cae3243d.tar.bz2
Revert 228779 "Update defaults for InstantExtended."
Introduces crashes on the mac tests: http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%284%29/builds/34018/steps/unit_tests/logs/stdio Specifically, these tests now crash: TabStripControllerTest.TabCloseDuringDrag TabposeWindowTest.TestModelObserver TabposeWindowTest.TestShow And this test suite is referenced in this patch. > Update defaults for InstantExtended. > > Flip the InstantExtended New Tab page to on by default and remove the flags. > Add a separate flag to control query in the omnibox (which is still off by > default). > > Also fixes a ton of tests that needed adjusting for Instant Extended. Mostly > the changes stem from the fact that we're prerendering the Instant Extended > New Tab page which changes assumptions in a bunch of tests. > > BUG=297915 > > Review URL: https://codereview.chromium.org/24733003 TBR=samarth@chromium.org Review URL: https://codereview.chromium.org/27235010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/all_urls_apitest.cc')
-rw-r--r--chrome/browser/extensions/all_urls_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
index 959e3b5e..24a1886 100644
--- a/chrome/browser/extensions/all_urls_apitest.cc
+++ b/chrome/browser/extensions/all_urls_apitest.cc
@@ -54,8 +54,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) {
std::string url;
- // Now verify we run content scripts on chrome://omnibox/.
- url = "chrome://omnibox/";
+ // Now verify we run content scripts on chrome://newtab/.
+ url = "chrome://newtab/";
ExtensionTestMessageListener listener1a("content script: " + url, false);
ExtensionTestMessageListener listener1b("execute: " + url, false);
ui_test_utils::NavigateToURL(browser(), GURL(url));