Add TitledUrlIndex for indexing arbitrary title/URL pairs

chrome/browser/android/bookmarks/bookmark_bridge.cc

 // Copyright 2013 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/android/bookmarks/bookmark_bridge.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/android/jni_array.h"
@@ skipping 575 matching lines @@
                                       jint max_results) {
   DCHECK(bookmark_model_->loaded());
 
   std::vector<bookmarks::BookmarkMatch> results;
   bookmark_model_->GetBookmarksMatching(
       base::android::ConvertJavaStringToUTF16(env, j_query),
       max_results,
       query_parser::MatchingAlgorithm::ALWAYS_PREFIX_SEARCH,
       &results);
   for (const bookmarks::BookmarkMatch& match : results) {
-    const BookmarkNode* node = match.node;
+    const TitledUrlNode* node = match.node;
 
     std::vector<int> title_match_start_positions;
     std::vector<int> title_match_end_positions;
     for (auto position : match.title_match_positions) {
       title_match_start_positions.push_back(position.first);
       title_match_end_positions.push_back(position.second);
     }
 
     std::vector<int> url_match_start_positions;
     std::vector<int> url_match_end_positions;
     for (auto position : match.url_match_positions) {
       url_match_start_positions.push_back(position.first);
       url_match_end_positions.push_back(position.second);
     }
 
     Java_BookmarkBridge_addToBookmarkMatchList(
-        env, j_list, node->id(), node->type(),
+        env, j_list, node->GetTitledUrlNodeId(), Type::URL,

[mattreynolds, 2016/12/08 21:09:39]

I missed this one when looking for users of BookmarkMatch. We don't have any
easy way to get the BookmarkNode from the TitledUrlNode here, so I added an ID
accessor to the interface.

We can safely replace the type() call with Type::URL because BookmarkClient
already prevents us from adding any non-URL nodes to the index.

[sky, 2016/12/08 23:01:07]

Is there a reason this code can't static cast to BookmarkNode? Will this code
ever be used with anything else?

[mattreynolds, 2016/12/09 02:01:14]

It's safe, for some reason I thought such casts were discouraged.

         ToJavaIntArray(env, title_match_start_positions),
         ToJavaIntArray(env, title_match_end_positions),
         ToJavaIntArray(env, url_match_start_positions),
         ToJavaIntArray(env, url_match_end_positions));
   }
 }
 
 ScopedJavaLocalRef<jobject> BookmarkBridge::AddFolder(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
@@ skipping 407 matching lines @@
   BookmarkModelChanged();
 }
 
 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
   NotifyIfDoneLoading();
 }
 
 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
   partner_bookmarks_shim_ = NULL;
 }