Revert 242029 "Omnibox: Bug Fixes for Shortcuts Inlining"

trunk/src/chrome/browser/autocomplete/shortcuts_provider_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/shortcuts_provider.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <functional>
@@ skipping 138 matching lines @@
     content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
     100 },
   { "BD85DBA2-8C29-49F9-84AE-48E1E90880F3", "query", "query",
     "https://www.google.com/search?q=query", "query", "0,0",
     "Google Search", "0,4", content::PAGE_TRANSITION_GENERATED,
     AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100 },
   { "BD85DBA2-8C29-49F9-84AE-48E1E90880F4", "word", "www.word",
     "https://www.google.com/search?q=www.word", "www.word", "0,0",
     "Google Search", "0,4", content::PAGE_TRANSITION_GENERATED,
     AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F5", "about:o", "chrome://omnibox",
-    "chrome://omnibox/", "about:omnibox", "0,3,10,1", "", "",
-    content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::NAVSUGGEST, "",
-    1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F6", "www/real sp",
-    "http://www/real space/long-url-with-space.html",
-    "http://www/real%20space/long-url-with-space.html",
-    "www/real space/long-url-with-space.html", "0,3,11,1",
-    "Page With Space; Input with Space", "0,0",
-    content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
-    1, 100 },
 };
 
 }  // namespace
 
 
 // ClassifyTest ---------------------------------------------------------------
 
 // Helper class to make running tests of ClassifyAllMatchesInString() more
 // convenient.
 class ClassifyTest {
@@ skipping 256 matching lines @@
   // non-droppable prefix.  ("www.", for instance, is not droppable for
   // queries.)
   text = ASCIIToUTF16("word");
   expected_url = "https://www.google.com/search?q=www.word";
   expected_urls.clear();
   expected_urls.push_back(
       ExpectedURLAndAllowedToBeDefault(expected_url, false));
   RunTest(text, false, expected_urls, expected_url, base::string16());
 }
 
-// These tests are like those in SimpleSingleMatch but more complex,
-// involving URLs that need to be fixed up to match properly.
-TEST_F(ShortcutsProviderTest, TrickySingleMatch) {
-  // Test that about: URLs are fixed up/transformed to chrome:// URLs.
-  base::string16 text(ASCIIToUTF16("about:o"));
-  std::string expected_url("chrome://omnibox/");
-  ExpectedURLs expected_urls;
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16("mnibox"));
-
-  // Same test with prevent inline autocomplete.
-  expected_urls.clear();
-  expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
-  // The match will have an |inline_autocompletion| set, but the value will not
-  // be used because |allowed_to_be_default_match| will be false.
-  RunTest(text, true, expected_urls, expected_url, ASCIIToUTF16("mnibox"));
-
-  // Test that an input with a space can match URLs with a (escaped) space.
-  // This would fail if we didn't try to lookup the un-fixed-up string.
-  text = ASCIIToUTF16("www/real sp");
-  expected_url = "http://www/real%20space/long-url-with-space.html";
-  expected_urls.clear();
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url,
-          ASCIIToUTF16("ace/long-url-with-space.html"));
-
-  // Same test with prevent inline autocomplete.
-  expected_urls.clear();
-  expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
-  // The match will have an |inline_autocompletion| set, but the value will not
-  // be used because |allowed_to_be_default_match| will be false.
-  RunTest(text, true, expected_urls, expected_url,
-          ASCIIToUTF16("ace/long-url-with-space.html"));
-}
-
 TEST_F(ShortcutsProviderTest, MultiMatch) {
   base::string16 text(ASCIIToUTF16("NEWS"));
   ExpectedURLs expected_urls;
   // Scores high because of completion length.
   expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
       "http://slashdot.org/", false));
   // Scores high because of visit count.
   expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
       "http://sports.yahoo.com/", false));
   // Scores high because of visit count but less match span,
@@ skipping 273 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(&profile_),
       content::Details<extensions::UnloadedExtensionInfo>(&details));
 
   // Now the URL should have disappeared.
   RunTest(text, false, ExpectedURLs(), std::string(), base::string16());
 }
 
 }  // namespace history