Bookmarks cleanup: Leverage PluralStringProxy class.

Bug: None
Change-Id: I825907f08eb3aed09e95a551338d9bbb3141ec7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2423356
Commit-Queue: John Lee <johntlee@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809383}

chrome/browser/resources/bookmarks/BUILD.gn

@@ -176,6 +176,7 @@ js_library("command_manager") {
     "//ui/webui/resources/cr_elements/cr_toast:cr_toast_manager.m",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js:plural_string_proxy",
     "//ui/webui/resources/js/cr/ui:keyboard_shortcut_list.m",
   ]
   externs_list = chrome_extension_public_externs + [
@@ -258,7 +259,6 @@ js_library("item") {
 js_library("list") {
   deps = [
     ":actions",
-    ":browser_proxy",
     ":command_manager",
     ":constants",
     ":item",
@@ -269,6 +269,7 @@ js_library("list") {
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:list_property_update_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js:plural_string_proxy",
   ]
 }
 

chrome/browser/resources/bookmarks/browser_proxy.js

@@ -23,14 +23,6 @@ export class BrowserProxy {
     return sendWithPromise('getCanEditBookmarks');
   }
 
-  /**
-   * @return {!Promise<string>} Promise resolved with the appropriate plural
-   *     string for |messageName| with |itemCount| items.
-   */
-  getPluralString(messageName, itemCount) {
-    return sendWithPromise('getPluralString', messageName, itemCount);
-  }
-
   /**
    * Notifies the metrics handler to record a histogram value.
    * @param {string} histogram The name of the histogram to record

chrome/browser/resources/bookmarks/command_manager.js

@@ -20,6 +20,7 @@ import {assert} from 'chrome://resources/js/assert.m.js';
 import {isMac} from 'chrome://resources/js/cr.m.js';
 import {KeyboardShortcutList} from 'chrome://resources/js/cr/ui/keyboard_shortcut_list.m.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
+import {PluralStringProxyImpl} from 'chrome://resources/js/plural_string_proxy.js';
 import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.js';
 import {afterNextRender, flush, html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
@@ -352,7 +353,7 @@ export const CommandManager = Polymer({
             labelPromise =
                 Promise.resolve(loadTimeData.getString('toastItemCopied'));
           } else {
-            labelPromise = this.browserProxy_.getPluralString(
+            labelPromise = PluralStringProxyImpl.getInstance().getPluralString(
                 'toastItemsCopied', idList.length);
           }
 
@@ -378,7 +379,7 @@ export const CommandManager = Polymer({
           labelPromise =
               Promise.resolve(loadTimeData.getString('toastItemDeleted'));
         } else {
-          labelPromise = this.browserProxy_.getPluralString(
+          labelPromise = PluralStringProxyImpl.getInstance().getPluralString(
               'toastItemsDeleted', idList.length);
         }
 

chrome/browser/resources/bookmarks/list.js

@@ -12,12 +12,12 @@ import {assert} from 'chrome://resources/js/assert.m.js';
 import {isMac} from 'chrome://resources/js/cr.m.js';
 import {ListPropertyUpdateBehavior} from 'chrome://resources/js/list_property_update_behavior.m.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
+import {PluralStringProxyImpl} from 'chrome://resources/js/plural_string_proxy.js';
 import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
 import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.js';
 import {afterNextRender, html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {deselectItems, selectAll, selectItem, updateAnchor} from './actions.js';
-import {BrowserProxy} from './browser_proxy.js';
 import {CommandManager} from './command_manager.js';
 import {MenuSource} from './constants.js';
 import {StoreClient} from './store_client.js';
@@ -144,7 +144,7 @@ Polymer({
     // Trigger a layout of the iron list. Otherwise some elements may render
     // as blank entries. See https://crbug.com/848683
     this.$.list.fire('iron-resize');
-    const label = await BrowserProxy.getInstance().getPluralString(
+    const label = await PluralStringProxyImpl.getInstance().getPluralString(
         'listChanged', this.displayedList_.length);
     this.fire('iron-announce', {text: label});
 

chrome/test/data/webui/bookmarks/test_browser_proxy.js

@@ -27,10 +27,6 @@ export class TestBookmarksBrowserProxy extends TestBrowserProxy {
     return Promise.resolve(false);
   }
 
-  getPluralString(messageName, itemCount) {
-    return Promise.resolve('test');
-  }
-
   recordInHistogram(histogram, bucket, maxBucket) {
     this.methodCalled('recordInHistogram');
   }