Revert 242029 "Omnibox: Bug Fixes for Shortcuts Inlining"

trunk/src/chrome/browser/autocomplete/history_provider.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/history_provider.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 22 matching lines @@
   HistoryService* const history_service =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
 
   // Delete the match from the history DB.
   DCHECK(history_service);
   DCHECK(match.destination_url.is_valid());
   history_service->DeleteURL(match.destination_url);
   DeleteMatchFromMatches(match);
 }
 
+HistoryProvider::~HistoryProvider() {}
+
+void HistoryProvider::DeleteMatchFromMatches(const AutocompleteMatch& match) {
+  bool found = false;
+  for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) {
+    if (i->destination_url == match.destination_url && i->type == match.type) {
+      found = true;
+      if (i->is_history_what_you_typed_match || i->starred) {
+        // We can't get rid of What-You-Typed or Bookmarked matches,
+        // but we can make them look like they have no backing data.
+        i->deletable = false;
+        i->description.clear();
+        i->description_class.clear();
+      } else {
+        matches_.erase(i);
+      }
+      break;
+    }
+  }
+  DCHECK(found) << "Asked to delete a URL that isn't in our set of matches";
+  listener_->OnProviderUpdate(true);
+}
+
 // static
 bool HistoryProvider::FixupUserInput(AutocompleteInput* input) {
   const base::string16& input_text = input->text();
   // Fixup and canonicalize user input.
   const GURL canonical_gurl(URLFixerUpper::FixupURL(UTF16ToUTF8(input_text),
                                                     std::string()));
   std::string canonical_gurl_str(canonical_gurl.possibly_invalid_spec());
   if (canonical_gurl_str.empty()) {
     // This probably won't happen, but there are no guarantees.
     return false;
@@ skipping 51 matching lines @@
     output.append(num_input_slashes - num_output_slashes, '/');
   else if (num_output_slashes > num_input_slashes)
     output.erase(output.length() - num_output_slashes + num_input_slashes);
 
   url_parse::Parsed parts;
   URLFixerUpper::SegmentURL(output, &parts);
   input->UpdateText(output, base::string16::npos, parts);
   return !output.empty();
 }
 
-HistoryProvider::~HistoryProvider() {}
-
-void HistoryProvider::DeleteMatchFromMatches(const AutocompleteMatch& match) {
-  bool found = false;
-  for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) {
-    if (i->destination_url == match.destination_url && i->type == match.type) {
-      found = true;
-      if (i->is_history_what_you_typed_match || i->starred) {
-        // We can't get rid of What-You-Typed or Bookmarked matches,
-        // but we can make them look like they have no backing data.
-        i->deletable = false;
-        i->description.clear();
-        i->description_class.clear();
-      } else {
-        matches_.erase(i);
-      }
-      break;
-    }
-  }
-  DCHECK(found) << "Asked to delete a URL that isn't in our set of matches";
-  listener_->OnProviderUpdate(true);
-}
-
 // static
 size_t HistoryProvider::TrimHttpPrefix(base::string16* url) {
   // Find any "http:".
   if (!AutocompleteInput::HasHTTPScheme(*url))
     return 0;
   size_t scheme_pos =
       url->find(ASCIIToUTF16(content::kHttpScheme) + char16(':'));
   DCHECK_NE(base::string16::npos, scheme_pos);
 
   // Erase scheme plus up to two slashes.
@@ skipping 37 matching lines @@
     do {
       offset += matches[i].length;
       ++i;
     } while ((i < match_count) && (offset == matches[i].offset));
     if (offset < text_length)
       spans.push_back(ACMatchClassification(offset, url_style));
   }
 
   return spans;
 }
+