summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-07 01:24:55 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-07 01:24:55 +0000
commitcd7fa99f1c2de523077984561d38ef62188f774b (patch)
tree1d73189221b440d4db97cfd8bd71a117ae29d0a4 /chrome/browser/autocomplete
parent14256d3c80984be35df633521ce66427eda654ba (diff)
downloadchromium_src-cd7fa99f1c2de523077984561d38ef62188f774b.zip
chromium_src-cd7fa99f1c2de523077984561d38ef62188f774b.tar.gz
chromium_src-cd7fa99f1c2de523077984561d38ef62188f774b.tar.bz2
Revert 99883 - Completely disable about:flags
This is an attempt to improve stability on the m14 branch. I will revert this CL right after merging it to m14. BUG=95592 TEST=Go to about:flags and chrome://flags. Nothing should be there. Go to about:version, no --begin-flags and --end-flags should be there. Review URL: http://codereview.chromium.org/7837006 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/7841022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/builtin_provider_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc
index 463388d4..8847bf4 100644
--- a/chrome/browser/autocomplete/builtin_provider_unittest.cc
+++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc
@@ -131,7 +131,7 @@ TEST_F(BuiltinProviderTest, NonChromeURLs) {
&AutocompleteMatch::destination_url);
}
-TEST_F(BuiltinProviderTest, DISABLED_ChromeURLs) {
+TEST_F(BuiltinProviderTest, ChromeURLs) {
const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme);
const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme);
const string16 kSeparator1 = ASCIIToUTF16(":");