Offline Item : Set title correctly at the offline pages backend

This CL consolidates the logic for determining the display name
 for offline pages in the backend. Earlier we were doing this
in the front-end at multiple places (e.g. download home,
notifications). With this change, we will set it as title
of the offline item in the backend itself. Downloads will also
follow a similar path after refactor to use offline items.

BUG=842803

Change-Id: I2c1a964f49f90fe5f145e5e7df95783ab6b3d269
Reviewed-on: https://chromium-review.googlesource.com/1054361
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: Dmitry Titov <dimich@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560380}

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfoBarController.java

@@ -35,7 +35,6 @@ import org.chromium.components.offline_items_collection.LegacyHelpers;
 import org.chromium.components.offline_items_collection.OfflineContentProvider;
 import org.chromium.components.offline_items_collection.OfflineItem;
 import org.chromium.components.offline_items_collection.OfflineItemState;
-import org.chromium.components.url_formatter.UrlFormatter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -559,7 +558,7 @@ public class DownloadInfoBarController implements OfflineContentProvider.Observe
             boolean singleDownloadCompleted =
                     itemCount == 1 && offlineItemState == OfflineItemState.COMPLETE;
             if (singleDownloadCompleted) {
-                info.message = getDisplayName(itemToShow);
+                info.message = itemToShow.title;
                 info.id = itemToShow.id;
                 info.link = getContext().getString(R.string.open_downloaded_label);
                 info.hasAnimation = true;
@@ -759,16 +758,6 @@ public class DownloadInfoBarController implements OfflineContentProvider.Observe
         return downloadCount;
     }
 
-    private String getDisplayName(OfflineItem item) {
-        if (LegacyHelpers.isLegacyOfflinePage(item.id)) {
-            // TODO(shaktisahu): Set the title in offline page backend.
-            if (!TextUtils.isEmpty(item.title)) return item.title;
-            return UrlFormatter.formatUrlForSecurityDisplay(item.pageUrl, false);
-        }
-
-        return item.title;
-    }
-
     /**
      * Clears the items in finished state, i.e. completed, failed or pending.
      * @param states States to be removed.

chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java

@@ -524,12 +524,7 @@ public abstract class DownloadHistoryItemWrapper extends TimedItem {
 
         @Override
         public String getDisplayFileName() {
-            String title = mItem.title;
-            if (TextUtils.isEmpty(title)) {
-                return getDisplayHostname();
-            } else {
-                return title;
-            }
+            return mItem.title;
         }
 
         @Override

chrome/browser/offline_pages/android/downloads/offline_page_notification_bridge.cc

@@ -13,23 +13,6 @@ using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 
-namespace {
-
-base::android::ScopedJavaLocalRef<jstring> GetDisplayName(
-    const OfflineItem& item) {
-  JNIEnv* env = AttachCurrentThread();
-  if (!item.title.empty())
-    return ConvertUTF8ToJavaString(env, item.title);
-
-  std::string host = item.page_url.host();
-  if (!host.empty())
-    return ConvertUTF8ToJavaString(env, host);
-
-  return ConvertUTF8ToJavaString(env, item.page_url.spec());
-}
-
-}  // namespace
-
 namespace offline_pages {
 namespace android {
 
@@ -38,7 +21,8 @@ void OfflinePageNotificationBridge::NotifyDownloadSuccessful(
   JNIEnv* env = AttachCurrentThread();
   Java_OfflinePageNotificationBridge_notifyDownloadSuccessful(
       env, ConvertUTF8ToJavaString(env, item.id.id),
-      ConvertUTF8ToJavaString(env, item.page_url.spec()), GetDisplayName(item));
+      ConvertUTF8ToJavaString(env, item.page_url.spec()),
+      ConvertUTF8ToJavaString(env, item.title));
 }
 
 void OfflinePageNotificationBridge::NotifyDownloadFailed(
@@ -46,7 +30,8 @@ void OfflinePageNotificationBridge::NotifyDownloadFailed(
   JNIEnv* env = AttachCurrentThread();
   Java_OfflinePageNotificationBridge_notifyDownloadFailed(
       env, ConvertUTF8ToJavaString(env, item.id.id),
-      ConvertUTF8ToJavaString(env, item.page_url.spec()), GetDisplayName(item),
+      ConvertUTF8ToJavaString(env, item.page_url.spec()),
+      ConvertUTF8ToJavaString(env, item.title),
       static_cast<jint>(item.fail_state));
 }
 
@@ -57,21 +42,23 @@ void OfflinePageNotificationBridge::NotifyDownloadProgress(
       env, ConvertUTF8ToJavaString(env, item.id.id),
       ConvertUTF8ToJavaString(env, item.page_url.spec()),
       item.creation_time.ToJavaTime(), item.received_bytes,
-      GetDisplayName(item));
+      ConvertUTF8ToJavaString(env, item.title));
 }
 
 void OfflinePageNotificationBridge::NotifyDownloadPaused(
     const OfflineItem& item) {
   JNIEnv* env = AttachCurrentThread();
   Java_OfflinePageNotificationBridge_notifyDownloadPaused(
-      env, ConvertUTF8ToJavaString(env, item.id.id), GetDisplayName(item));
+      env, ConvertUTF8ToJavaString(env, item.id.id),
+      ConvertUTF8ToJavaString(env, item.title));
 }
 
 void OfflinePageNotificationBridge::NotifyDownloadInterrupted(
     const OfflineItem& item) {
   JNIEnv* env = AttachCurrentThread();
   Java_OfflinePageNotificationBridge_notifyDownloadInterrupted(
-      env, ConvertUTF8ToJavaString(env, item.id.id), GetDisplayName(item),
+      env, ConvertUTF8ToJavaString(env, item.id.id),
+      ConvertUTF8ToJavaString(env, item.title),
       static_cast<jint>(item.pending_state));
 }
 

components/offline_pages/core/downloads/offline_item_conversions.cc

@@ -18,6 +18,20 @@ using PendingState = offline_items_collection::PendingState;
 
 namespace {
 
+const std::string GetDisplayName(const offline_pages::OfflinePageItem& page) {
+  if (!page.title.empty())
+    return base::UTF16ToUTF8(page.title);
+
+  std::string host = page.url.host();
+  return host.empty() ? page.url.spec() : host;
+}
+
+const std::string GetDisplayName(
+    const offline_pages::SavePageRequest& request) {
+  std::string host = request.url().host();
+  return host.empty() ? request.url().spec() : host;
+}
+
 const std::string GetMimeType() {
   return offline_pages::IsOfflinePagesSharingEnabled() ? "multipart/related"
                                                        : "text/html";
@@ -32,7 +46,7 @@ OfflineItem OfflineItemConversions::CreateOfflineItem(
     bool is_suggested) {
   OfflineItem item;
   item.id = ContentId(kOfflinePageNamespace, page.client_id.id);
-  item.title = base::UTF16ToUTF8(page.title);
+  item.title = GetDisplayName(page);
   item.filter = OfflineItemFilter::FILTER_PAGE;
   item.state = OfflineItemState::COMPLETE;
   item.total_size_bytes = page.file_size;
@@ -54,6 +68,7 @@ OfflineItem OfflineItemConversions::CreateOfflineItem(
     const SavePageRequest& request) {
   OfflineItem item;
   item.id = ContentId(kOfflinePageNamespace, request.client_id().id);
+  item.title = GetDisplayName(request);
   item.filter = OfflineItemFilter::FILTER_PAGE;
   item.creation_time = request.creation_time();
   item.total_size_bytes = -1L;