Change to use emoji data from emoji-metadata.

A basic emoji_ordering.json was used for testing while we were waiting
for emoji-metadata to be imported into third_party. Now that that is
done, we can directly use the emoji ordering from there.

Bug: 1152237
Change-Id: I70b58f2b6ebe712b3fad0fdb7a2a5ee2af466779
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617409Reviewed-by: John Palmer <jopalmer@chromium.org>
Reviewed-by: Keith Lee <keithlee@chromium.org>
Commit-Queue: Kenton Lam <kentonlam@google.com>
Cr-Commit-Position: refs/heads/master@{#842271}

chrome/browser/resources/chromeos/emoji_picker/BUILD.gn

@@ -18,21 +18,27 @@ polymer_deps =
 
 resources_grd_file = "$target_gen_dir/resources.grd"
 components_grdp_file = "$target_gen_dir/components.grdp"
+data_grdp_file = "$target_gen_dir/data.grdp"
 
 generate_grd("build_grd") {
-  deps = [ ":build_grdp" ]
+  deps = [
+    ":build_components_grdp",
+    ":build_data_grdp",
+  ]
   grd_prefix = "emoji_picker"
   out_grd = resources_grd_file
   input_files = [
     "index.html",
     "types.js",
-    "emoji_ordering.json",
   ]
-  grdp_files = [ components_grdp_file ]
+  grdp_files = [
+    components_grdp_file,
+    data_grdp_file,
+  ]
   input_files_base_dir = rebase_path(".", "//")
 }
 
-generate_grd("build_grdp") {
+generate_grd("build_components_grdp") {
   deps = [ ":web_components" ]
   grd_prefix = "emoji_picker"
   out_grd = components_grdp_file
@@ -40,6 +46,13 @@ generate_grd("build_grdp") {
   input_files_base_dir = rebase_path(target_gen_dir, root_build_dir)
 }
 
+generate_grd("build_data_grdp") {
+  grd_prefix = "emoji_picker"
+  out_grd = data_grdp_file
+  input_files = [ "emoji_13_1_ordering.json" ]
+  input_files_base_dir = rebase_path("//third_party/emoji-metadata/src", "//")
+}
+
 grit("resources") {
   # These arguments are needed since the grd is generated at build time.
   enable_input_discovery_for_gn_analyze = false

chrome/browser/resources/chromeos/emoji_picker/emoji_picker.js

@@ -12,7 +12,7 @@ import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/poly
 
 import {EmojiData} from './types.js';
 
-const EMOJI_ORDERING_JSON = '/emoji_ordering.json';
+const EMOJI_ORDERING_JSON = '/emoji_13_1_ordering.json';
 
 class EmojiPicker extends PolymerElement {
   static get is() {
@@ -41,7 +41,6 @@ class EmojiPicker extends PolymerElement {
     xhr.send();
 
     this.emojiData = [];
-    this.emoji = loadTimeData.getString('emoji').split(',');
     this.search = '';
   }