[Offline pages] Lighting up the bookmark star for saved recent pages

chrome/browser/android/tab_android.cc

 // Copyright 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/android/tab_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 743 matching lines @@
       render_frame_host->GetRoutingID()));
 }
 
 jlong TabAndroid::GetBookmarkId(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 jboolean only_editable) {
   GURL url = dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(
       web_contents()->GetURL());
   Profile* profile = GetProfile();
 
-  // If the url points to an offline page, it already has a bookmark ID that it
-  // is related to.
-  int64_t candidate_bookmark_id =
-      offline_pages::OfflinePageUtils::GetBookmarkIdForOfflineURL(profile, url);
+  // If the url points to an offline page, then we need to get its original URL.
+  if (offline_pages::OfflinePageUtils::IsOfflinePage(profile, url)) {
+    url = offline_pages::OfflinePageUtils::GetOnlineURLForOfflineURL(profile,
+                                                                     url);
+  }
 
   // Get all the nodes for |url| and sort them by date added.
   std::vector<const bookmarks::BookmarkNode*> nodes;
   bookmarks::ManagedBookmarkService* managed =
       ManagedBookmarkServiceFactory::GetForProfile(profile);
   bookmarks::BookmarkModel* model =
       BookmarkModelFactory::GetForProfile(profile);
 
-  // If we have a candidate bookmark ID from the offline page model and that ID
-  // matches an existing bookmark, return it.
-  if (candidate_bookmark_id != -1 &&
-      bookmarks::GetBookmarkNodeByID(model, candidate_bookmark_id) != nullptr) {
-    return candidate_bookmark_id;
-  }
-
   model->GetNodesByURL(url, &nodes);
   std::sort(nodes.begin(), nodes.end(), &bookmarks::MoreRecentlyAdded);
 
   // Return the first node matching the search criteria.
   for (size_t i = 0; i < nodes.size(); ++i) {
     if (only_editable && !managed->CanBeEditedByUser(nodes[i]))
       continue;
     return nodes[i]->id();
   }
 
@@ skipping 123 matching lines @@
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }