Reland part 3 of 4: Modify blink users so they use blink images.

Now that the image resources that blink depends on are in the blink
repository, we depend on the blink resources directly, delete the ones
in the chrome tree, and use these resources in the html_viewer.

[This reland also contains a fix to the generate_blink_resource_map.py
file so that its generated code uses unsigned chars, which should
hopefully fix the Win8 gn bot.]

BUG=467176
First Review URL: https://codereview.chromium.org/1033733004

Review URL: https://codereview.chromium.org/1038723002

Cr-Commit-Position: refs/heads/master@{#322427}

android_webview/android_webview.gyp

@@ -20,7 +20,7 @@
           'action_name': 'repack_android_webview_pack',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',

chrome/BUILD.gn

@@ -484,7 +484,6 @@ repack("packed_extra_resources") {
   }
   if (!is_ios) {
     sources += [
-      "$root_gen_dir/blink/public/resources/blink_resources.pak",
       "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
       "$root_gen_dir/content/content_resources.pak",
     ]
@@ -587,7 +586,10 @@ template("chrome_repack_percent") {
     ]
 
     if (!is_ios) {
-      sources += [ "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak" ]
+      sources += [
+        "$root_gen_dir/blink/public/resources/blink_resources_${percent}_percent.pak",
+        "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
+      ]
       deps += [ "//content:resources" ]
     }
     if (use_ash) {

chrome/chrome_repack_chrome_100_percent.gypi

@@ -15,6 +15,7 @@
     'conditions': [
       ['OS != "ios"', {
         'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak',
           '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
         ],
       }],

chrome/chrome_repack_chrome_200_percent.gypi

@@ -15,6 +15,7 @@
     'conditions': [
       ['OS != "ios"', {
         'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_200_percent.pak',
           '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_200_percent.pak',
         ],
       }],

chrome/chrome_repack_resources.gypi

@@ -29,7 +29,7 @@
       }],
       ['OS != "ios"', {
         'pak_inputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak',
           '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
         ],

chromecast/chromecast.gyp

@@ -122,7 +122,7 @@
           'action_name': 'repack_cast_shell_pak',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/chromecast/shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',

content/app/resources/content_resources.grd

@@ -9,46 +9,6 @@
   </outputs>
   <release seq="1">
     <structures fallback_to_low_resolution="true">
-      <structure type="chrome_scaled_image" name="IDR2_BROKENIMAGE" file="broken_image.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON" file="mediaplayer_pause.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER" file="mediaplayer_pause_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN" file="mediaplayer_pause_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON" file="mediaplayer_play.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER" file="mediaplayer_play_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN" file="mediaplayer_play_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED" file="mediaplayer_play_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON" file="mediaplayer_sound_level3.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER" file="mediaplayer_sound_level3_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN" file="mediaplayer_sound_level3_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON" file="mediaplayer_sound_level2.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER" file="mediaplayer_sound_level2_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN" file="mediaplayer_sound_level2_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON" file="mediaplayer_sound_level1.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER" file="mediaplayer_sound_level1_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN" file="mediaplayer_sound_level1_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON" file="mediaplayer_sound_level0.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER" file="mediaplayer_sound_level0_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN" file="mediaplayer_sound_level0_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_DISABLED" file="mediaplayer_sound_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB" file="mediaplayer_slider_thumb.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER" file="mediaplayer_slider_thumb_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN" file="mediaplayer_slider_thumb_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB" file="mediaplayer_volume_slider_thumb.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER" file="mediaplayer_volume_slider_thumb_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN" file="mediaplayer_volume_slider_thumb_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED" file="mediaplayer_volume_slider_thumb_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON" file="mediaplayer_closedcaption.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER" file="mediaplayer_closedcaption_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN" file="mediaplayer_closedcaption_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED" file="mediaplayer_closedcaption_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON" file="mediaplayer_fullscreen.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER" file="mediaplayer_fullscreen_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN" file="mediaplayer_fullscreen_down.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED" file="mediaplayer_fullscreen_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CAST_BUTTON_OFF" file="mediaplayer_cast_off.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CAST_BUTTON_ON" file="mediaplayer_cast_on.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF" file="mediaplayer_overlay_cast_off.png" />
-      <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON" file="mediaplayer_overlay_play.png" />
       <if expr="is_macosx">
         <structure type="chrome_scaled_image" name="IDR_ALIAS_CURSOR" file="alias_cursor.png" />
         <structure type="chrome_scaled_image" name="IDR_CELL_CURSOR" file="cell_cursor.png" />
@@ -74,14 +34,6 @@
         <structure type="chrome_scaled_image" name="IDR_ZOOMIN_CURSOR" file="zoom_in_cursor.png" />
         <structure type="chrome_scaled_image" name="IDR_ZOOMOUT_CURSOR" file="zoom_out_cursor.png" />
       </if>
-      <structure type="chrome_scaled_image" name="IDR2_PAN_SCROLL_ICON" file="pan_icon.png" />
-      <structure type="chrome_scaled_image" name="IDR2_SEARCH_CANCEL" file="search_cancel.png" />
-      <structure type="chrome_scaled_image" name="IDR2_SEARCH_CANCEL_PRESSED" file="search_cancel_pressed.png" />
-      <structure type="chrome_scaled_image" name="IDR2_SEARCH_MAGNIFIER" file="search_magnifier.png" />
-      <structure type="chrome_scaled_image" name="IDR2_SEARCH_MAGNIFIER_RESULTS" file="search_magnifier_results.png" />
-      <structure type="chrome_scaled_image" name="IDR2_TEXTAREA_RESIZER" file="textarea_resize_corner.png" />
-      <structure type="chrome_scaled_image" name="IDR2_PASSWORD_GENERATION_ICON" file="password_generation.png" />
-      <structure type="chrome_scaled_image" name="IDR2_PASSWORD_GENERATION_ICON_HOVER" file="password_generation_hover.png" />
     </structures>
   </release>
 </grit>

content/child/blink_platform_impl.cc

@@ -738,95 +738,95 @@ struct DataResource {
 };
 
 const DataResource kDataResources[] = {
-  { "missingImage", IDR2_BROKENIMAGE, ui::SCALE_FACTOR_100P },
-  { "missingImage@2x", IDR2_BROKENIMAGE, ui::SCALE_FACTOR_200P },
-  { "mediaplayerPause", IDR2_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P },
+  { "missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P },
+  { "missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P },
+  { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P },
   { "mediaplayerPauseHover",
-    IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerPauseDown",
-    IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
-  { "mediaplayerPlay", IDR2_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+  { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
   { "mediaplayerPlayHover",
-    IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerPlayDown",
-    IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerPlayDisabled",
-    IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel3",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel3Hover",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel3Down",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel2",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel2Hover",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel2Down",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel1",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel1Hover",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel1Down",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel0",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel0Hover",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundLevel0Down",
-    IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerSoundDisabled",
-    IDR2_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P },
   { "mediaplayerSliderThumb",
-    IDR2_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
   { "mediaplayerSliderThumbHover",
-    IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerSliderThumbDown",
-    IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerVolumeSliderThumb",
-    IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
   { "mediaplayerVolumeSliderThumbHover",
-    IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerVolumeSliderThumbDown",
-    IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerVolumeSliderThumbDisabled",
-    IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
   { "mediaplayerClosedCaption",
-    IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P },
   { "mediaplayerClosedCaptionHover",
-    IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerClosedCaptionDown",
-    IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerClosedCaptionDisabled",
-    IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
   { "mediaplayerFullscreen",
-    IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
   { "mediaplayerFullscreenHover",
-    IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
   { "mediaplayerFullscreenDown",
-    IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
   { "mediaplayerCastOff",
-    IDR2_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
   { "mediaplayerCastOn",
-    IDR2_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P },
   { "mediaplayerFullscreenDisabled",
-    IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
   { "mediaplayerOverlayCastOff",
-    IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
   { "mediaplayerOverlayPlay",
-    IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
-  { "panIcon", IDR2_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P },
-  { "searchCancel", IDR2_SEARCH_CANCEL, ui::SCALE_FACTOR_100P },
-  { "searchCancelPressed", IDR2_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P },
-  { "searchMagnifier", IDR2_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P },
+    IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
+  { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P },
+  { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P },
+  { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P },
+  { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P },
   { "searchMagnifierResults",
-    IDR2_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P },
-  { "textAreaResizeCorner", IDR2_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P },
-  { "textAreaResizeCorner@2x", IDR2_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P },
-  { "generatePassword", IDR2_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P },
+    IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P },
+  { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P },
+  { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P },
+  { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P },
   { "generatePasswordHover",
-    IDR2_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P },
+    IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P },
   { "html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE },
   { "quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE },
   { "view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE },

content/content_shell.gypi

@@ -500,7 +500,7 @@
           'action_name': 'repack_content_shell_pack',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',

content/shell/BUILD.gn

@@ -452,7 +452,7 @@ group("resources") {
 
 repack("pak") {
   sources = [
-    "$root_gen_dir/blink/public/resources/blink_resources.pak",
+    "$root_gen_dir/blink/public/resources/blink_resources_100_percent.pak",
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
     "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",

content/shell/common/shell_content_client.cc

@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
+#include "blink/public/resources/grit/blink_resources.h"
 #include "content/app/resources/grit/content_resources.h"
 #include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/content_switches.h"
@@ -64,7 +65,7 @@ base::StringPiece ShellContentClient::GetDataResource(
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kRunLayoutTest)) {
     switch (resource_id) {
-      case IDR2_BROKENIMAGE:
+      case IDR_BROKENIMAGE:
 #if defined(OS_MACOSX)
         resource_id = IDR_CONTENT_SHELL_MISSING_IMAGE_PNG;
 #else
@@ -72,7 +73,7 @@ base::StringPiece ShellContentClient::GetDataResource(
 #endif
         break;
 
-      case IDR2_TEXTAREA_RESIZER:
+      case IDR_TEXTAREA_RESIZER:
         resource_id = IDR_CONTENT_SHELL_TEXT_AREA_RESIZE_CORNER_PNG;
         break;
     }

extensions/BUILD.gn

@@ -99,7 +99,7 @@ source_set("test_support") {
 repack("shell_and_test_pak") {
   sources = [
     "$root_gen_dir/blink/devtools_resources.pak",
-    "$root_gen_dir/blink/public/resources/blink_resources.pak",
+    "$root_gen_dir/blink/public/resources/blink_resources_100_percent.pak",
     "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/content/shell/shell_resources.pak",

extensions/extensions.gyp

@@ -289,7 +289,7 @@
           'action_name': 'repack_extensions_shell_and_test_pak',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',

mojo/services/html_viewer/BUILD.gn

@@ -10,7 +10,8 @@ action("generate_blink_resource_map") {
   script = "//mojo/services/html_viewer/generate_blink_resource_map.py"
   args = [
     "--pak-file",
-    rebase_path("$root_out_dir/gen/blink/public/resources/blink_resources.pak"),
+    rebase_path(
+        "$root_out_dir/gen/blink/public/resources/blink_resources_100_percent.pak"),
     "--header",
     rebase_path("$target_gen_dir/blink_resource_map.h"),
     "--cpp",

mojo/services/html_viewer/blink_platform_impl.cc

@@ -157,10 +157,10 @@ blink::WebData BlinkPlatformImpl::loadResource(const char* resource) {
   for (size_t i = 0; i < arraysize(kDataResources); ++i) {
     if (!strcmp(resource, kDataResources[i].name)) {
       int length;
-      const char* data =
+      const unsigned char* data =
           blink_resource_map_.GetResource(kDataResources[i].id, &length);
       CHECK(data != nullptr && length > 0);
-      return blink::WebData(data, length);
+      return blink::WebData(reinterpret_cast<const char*>(data), length);
     }
   }
   NOTREACHED() << "Requested resource is unavailable: " << resource;

mojo/services/html_viewer/blink_resource_constants.h

@@ -15,6 +15,62 @@ struct DataResource {
 };
 
 const DataResource kDataResources[] = {
+    {"missingImage", IDR_BROKENIMAGE},
+    // Skipping missingImage@2x
+    {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON},
+    {"mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER},
+    {"mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN},
+    {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON},
+    {"mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER},
+    {"mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN},
+    {"mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED},
+    {"mediaplayerSoundLevel3", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON},
+    {"mediaplayerSoundLevel3Hover", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER},
+    {"mediaplayerSoundLevel3Down", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN},
+    {"mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON},
+    {"mediaplayerSoundLevel2Hover", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER},
+    {"mediaplayerSoundLevel2Down", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN},
+    {"mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON},
+    {"mediaplayerSoundLevel1Hover", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER},
+    {"mediaplayerSoundLevel1Down", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN},
+    {"mediaplayerSoundLevel0", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON},
+    {"mediaplayerSoundLevel0Hover", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER},
+    {"mediaplayerSoundLevel0Down", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN},
+    {"mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED},
+    {"mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB},
+    {"mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER},
+    {"mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN},
+    {"mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB},
+    {"mediaplayerVolumeSliderThumbHover",
+     IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER},
+    {"mediaplayerVolumeSliderThumbDown",
+     IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN},
+    {"mediaplayerVolumeSliderThumbDisabled",
+     IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED},
+    {"mediaplayerClosedCaption", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON},
+    {"mediaplayerClosedCaptionHover",
+     IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER},
+    {"mediaplayerClosedCaptionDown", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN},
+    {"mediaplayerClosedCaptionDisabled",
+     IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED},
+    {"mediaplayerFullscreen", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON},
+    {"mediaplayerFullscreenHover", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER},
+    {"mediaplayerFullscreenDown", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN},
+    {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF},
+    {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON},
+    {"mediaplayerFullscreenDisabled",
+     IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED},
+    {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF},
+    {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON},
+    {"panIcon", IDR_PAN_SCROLL_ICON},
+    {"searchCancel", IDR_SEARCH_CANCEL},
+    {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED},
+    {"searchMagnifier", IDR_SEARCH_MAGNIFIER},
+    {"searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS},
+    {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER},
+    // Skipping "textAreaResizeCorner@2x"
+    {"generatePassword", IDR_PASSWORD_GENERATION_ICON},
+    {"generatePasswordHover", IDR_PASSWORD_GENERATION_ICON_HOVER},
     {"html.css", IDR_UASTYLE_HTML_CSS},
     {"quirks.css", IDR_UASTYLE_QUIRKS_CSS},
     {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS},

mojo/services/html_viewer/generate_blink_resource_map.py

@@ -17,9 +17,6 @@ except ImportError, e:
   print 'ImportError: ', e
   sys.exit(-1)
 
-def is_ascii(s):
-  return all(ord(c) < 128 for c in s)
-
 header_template = \
 """// Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ -35,11 +32,11 @@ namespace html_viewer {
 class BlinkResourceMap {
  public:
   BlinkResourceMap();
-  const char* GetResource(int id, int* length);
+  const unsigned char* GetResource(int id, int* length);
 
  private:
   struct ResourceEntry {
-    const char* data;
+    const unsigned char* data;
     int length;
 
     ResourceEntry()
@@ -47,7 +44,7 @@ class BlinkResourceMap {
       , length(0) {
     }
 
-    ResourceEntry(const char* data, int length)
+    ResourceEntry(const unsigned char* data, int length)
       : data(data)
       , length(length) {
     }
@@ -77,7 +74,7 @@ BlinkResourceMap::BlinkResourceMap()
   $map_initializer
 }
 
-const char* BlinkResourceMap::GetResource(int id, int* length)
+const unsigned char* BlinkResourceMap::GetResource(int id, int* length)
 {
   ResourceMap::iterator it = resources_.find(id);
   if (it == resources_.end()) {
@@ -117,14 +114,12 @@ def main():
   definitions = []
 
   for (resId, data) in pak_contents.resources.iteritems():
-    if not is_ascii(data):
-      continue
     resourceIds.append(resId)
     hex_values = ['0x{0:02x}'.format(ord(char)) for char in data]
     f = lambda A, n=12: [A[i:i+n] for i in range(0, len(A), n)]
     hex_values_string = ',\n    '.join(', '.join(x) for x in f(hex_values))
     cpp_definition = \
-        'const char kResource%s[%d] = {\n    %s \n};' % \
+        'const unsigned char kResource%s[%d] = {\n    %s \n};' % \
         (str(resId), len(hex_values), hex_values_string)
     definitions.append(cpp_definition)
 

tools/gritsettings/resource_ids

@@ -234,10 +234,10 @@
     "messages": [30000],
   },
   "components/resources/components_resources.grd": {
-    "includes": [30250],
+    "includes": [30225],
   },
   "components/resources/components_scaled_resources.grd": {
-    "structures": [30300],
+    "structures": [30280],
   },
   "third_party/WebKit/public/blink_resources.grd": {
     "includes": [30350],