Move bookmarks' production code to components/bookmarks

components/bookmarks/core/browser/bookmark_index.cc

Index: components/bookmarks/core/browser/bookmark_index.cc
diff --git a/chrome/browser/bookmarks/bookmark_index.cc b/components/bookmarks/core/browser/bookmark_index.cc
similarity index 98%
rename from chrome/browser/bookmarks/bookmark_index.cc
rename to components/bookmarks/core/browser/bookmark_index.cc
index 415f04b25c183c1c2b938baa03a6dbafea982dca..5899442865cf495a58f6d7ab72bbac7982387a9d 100644
--- a/chrome/browser/bookmarks/bookmark_index.cc
+++ b/components/bookmarks/core/browser/bookmark_index.cc
@@ -2,7 +2,7 @@
 // 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_index.h"
+#include "components/bookmarks/core/browser/bookmark_index.h"
 
 #include <algorithm>
 #include <functional>
@@ -13,10 +13,10 @@
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_offset_string_conversions.h"
-#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "components/bookmarks/core/browser/bookmark_client.h"
 #include "components/bookmarks/core/browser/bookmark_match.h"
 #include "components/bookmarks/core/browser/bookmark_node.h"
+#include "components/bookmarks/core/browser/bookmark_utils.h"
 #include "components/query_parser/query_parser.h"
 #include "components/query_parser/snippet.h"
 #include "third_party/icu/source/common/unicode/normalizer2.h"
@@ -32,7 +32,8 @@ base::string16 Normalize(const base::string16& text) {
   UErrorCode status = U_ZERO_ERROR;
   const icu::Normalizer2* normalizer2 =
       icu::Normalizer2::getInstance(NULL, "nfkc", UNORM2_COMPOSE, status);
-  icu::UnicodeString unicode_text(text.data(), text.length());
+  icu::UnicodeString unicode_text(
+      text.data(), static_cast<int32_t>(text.length()));
   icu::UnicodeString unicode_normalized_text;
   normalizer2->normalize(unicode_text, unicode_normalized_text, status);
   if (U_FAILURE(status))