Factor out AutocompleteMatch creation from BookmarkProvider

components/bookmarks/browser/titled_url_match.cc

 // Copyright 2014 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 "components/bookmarks/browser/titled_url_match.h"
 
 #include "base/logging.h"
-#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
 
 namespace bookmarks {
 
 TitledUrlMatch::TitledUrlMatch() : node(NULL) {}
 
 TitledUrlMatch::TitledUrlMatch(const TitledUrlMatch& other) = default;
 
 TitledUrlMatch::~TitledUrlMatch() {}
 
 // static
@@ skipping 21 matching lines @@
     ++offset_iter;
     const size_t end = *offset_iter;
     if ((begin != base::string16::npos) && (end != base::string16::npos)) {
       const MatchPosition new_match_position(begin, end);
       new_match_positions.push_back(new_match_position);
     }
   }
   return new_match_positions;
 }
 
+// static
+void TitledUrlMatch::CorrectTitleAndMatchPositions(
+    base::string16* title,
+    MatchPositions* title_match_positions) {
+  size_t leading_whitespace_chars = title->length();
+  base::TrimWhitespace(*title, base::TRIM_LEADING, title);
+  leading_whitespace_chars -= title->length();
+  if (leading_whitespace_chars == 0) {

[sky, 2016/12/16 19:32:54]

no {}

[mattreynolds, 2016/12/19 20:09:15]

Done.

+    return;
+  }
+  for (MatchPositions::iterator it = title_match_positions->begin();
+       it != title_match_positions->end(); ++it) {
+    (*it) = MatchPosition(it->first - leading_whitespace_chars,

[sky, 2016/12/16 19:32:54]

optional: do an in place update, e.g. it->first -= leading_whitespace_chars.

[mattreynolds, 2016/12/19 20:09:15]

Done.

+                          it->second - leading_whitespace_chars);
+  }
+}
+
 }  // namespace bookmarks