Omnibox: Make URLs of Bookmarks Searchable

chrome/browser/bookmarks/bookmark_utils.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/bookmarks/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/query_parser/query_parser.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/user_metrics.h"
 #include "net/base/net_util.h"
 #include "ui/base/models/tree_node_iterator.h"
+#include "url/gurl.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/bookmarks/scoped_group_bookmark_actions.h"
 #endif
 
 using base::Time;
 
 namespace {
 
+// The maximum length of URL or title returned by the Cleanup functions.
+static const size_t kCleanedUpUrlMaxLength = 1024u;

[tfarina, 2014/04/18 00:26:04]

No static needed. You are already in an unnamed namespace.

[Mark P, 2014/04/18 14:52:43]

Done.
(here and below)

+static const size_t kCleanedUpTitleMaxLength = 1024u;
+
 void CloneBookmarkNodeImpl(BookmarkModel* model,
                            const BookmarkNodeData::Element& element,
                            const BookmarkNode* parent,
                            int index_to_add_at,
                            bool reset_node_times) {
   const BookmarkNode* cloned_node = NULL;
   if (element.is_url) {
     if (reset_node_times) {
       cloned_node = model->AddURL(parent, index_to_add_at, element.title,
                                   element.url);
@@ skipping 61 matching lines @@
   if (!node || model->is_permanent_node(node))
     return false;
 
   for (size_t i = 0; i < selected_nodes.size(); ++i)
     if (node->id() == selected_nodes[i]->id())
       return true;
 
   return HasSelectedAncestor(model, selected_nodes, node->parent());
 }
 
+// Attempts to shorten a URL safely (i.e., by preventing the end of the URL
+// from being in the middle of an escape sequence) to no more than
+// kCleanedUpUrlMaxLength characters, returning the result.
+std::string TruncateUrl(const std::string& url) {
+  if (url.length() <= kCleanedUpUrlMaxLength)
+    return url;
+
+  // If we're in the middle of an escape sequence, truncate just before it.
+  if (url[kCleanedUpUrlMaxLength - 1] == '%')
+    return url.substr(0, kCleanedUpUrlMaxLength - 1);
+  if (url[kCleanedUpUrlMaxLength - 2] == '%')
+    return url.substr(0, kCleanedUpUrlMaxLength - 2);
+
+  return url.substr(0, kCleanedUpUrlMaxLength);
+}
+
 }  // namespace
 
 namespace bookmark_utils {
 
 QueryFields::QueryFields() {}
 QueryFields::~QueryFields() {}
 
 void CloneBookmarkNode(BookmarkModel* model,
                        const std::vector<BookmarkNodeData::Element>& elements,
                        const BookmarkNode* parent,
@@ skipping 243 matching lines @@
 
   // Remove all the bookmarks.
   for (size_t i = 0; i < bookmarks.size(); ++i) {
     const BookmarkNode* node = bookmarks[i];
     int index = node->parent()->GetIndexOf(node);
     if (index > -1)
       model->Remove(node->parent(), index);
   }
 }
 
+base::string16 CleanUpUrlForMatching(const GURL& gurl,
+                                     const std::string& languages) {
+  return base::i18n::ToLower(net::FormatUrl(
+      GURL(TruncateUrl(gurl.spec())), languages,
+      net::kFormatUrlOmitUsernamePassword,
+      net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS,
+      NULL, NULL, NULL));
+}
+
+base::string16 CleanUpTitleForMatching(const base::string16& title) {
+  return base::i18n::ToLower(title.substr(0u, kCleanedUpTitleMaxLength));
+}
+
 }  // namespace bookmark_utils