Made BookmarkService::GetBookmarks return both urls and title.

chrome/browser/history/android/android_provider_backend.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/history/android/android_provider_backend.h"
 
 #include "base/i18n/case_conversion.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/browser/history/android/android_time.h"
@@ skipping 731 matching lines @@
   return history_db_->DeleteUnusedAndroidURLs();
 }
 
 bool AndroidProviderBackend::UpdateBookmarks() {
   if (bookmark_service_ == NULL) {
     LOG(ERROR) << "Bookmark service is not available";
     return false;
   }
 
   bookmark_service_->BlockTillLoaded();
-  std::vector<GURL> bookmark_urls;
-  bookmark_service_->GetBookmarks(&bookmark_urls);
+  std::vector<BookmarkService::URLAndTitle> bookmarks;
+  bookmark_service_->GetBookmarks(&bookmarks);
 
-  if (bookmark_urls.empty())
+  if (bookmarks.empty())
     return true;
 
   std::vector<URLID> url_ids;
-  for (std::vector<GURL>::const_iterator i = bookmark_urls.begin();
-      i != bookmark_urls.end(); ++i) {
-    URLID url_id = history_db_->GetRowForURL(*i, NULL);
+  for (std::vector<BookmarkService::URLAndTitle>::const_iterator i =
+           bookmarks.begin(); i != bookmarks.end(); ++i) {
+    URLID url_id = history_db_->GetRowForURL(i->url, NULL);
     if (url_id == 0)
       // TODO(michaelbai): Add a row to url and android_url table as the
       // bookmark could be added manually by user or insertted by sync.
       continue;
 
     url_ids.push_back(url_id);
   }
 
   return history_db_->MarkURLsAsBookmarked(url_ids);
 }
@@ skipping 375 matching lines @@
       return false;
 
     if (!history_db_->SetKeywordSearchTermsForURL(bookmark_row.url_id(),
                           values.template_url_id(), values.search_term()))
       return false;
   }
   return true;
 }
 
 }  // namespace history