Part 7 of 8: Move blink images to their own grd/pak file.

This moves the image IDRs used on the chrome side back from IDR2_ to the
IDR_ versions. (The next and final patch will remove the IDR2_s from
webkit.)

BUG=471609, 467176

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

Cr-Commit-Position: refs/heads/master@{#324401}
(cherry picked from commit 9f7f233a6d875fc7cb99785ab40b51089e029016)

Merge commit 'refs/branch-heads/2357' of https://chromium.googlesource.com/a/chromium/src into drover_2357

Fixed the incorrect PDF sizing on emulated devices in devtools.

BUG=474191

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

Cr-Commit-Position: refs/heads/master@{#324753}
(cherry picked from commit cd7a39ac205a3c9c8110ef9f2d42f44196fa49c9)

Merge commit 'refs/branch-heads/2357' of https://chromium.googlesource.com/a/chromium/src into drover_2357

[Session restore] Rename group name Enabled to Restore.

TBR=sky@chromium.org
BUG=465815

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

Cr-Commit-Position: refs/heads/master@{#324154}
(cherry picked from commit 1b5266d8d43ea002c8b21cec8afbcedeace6b1e0)

Change logic to enable for group Enabled (for A/B testing).

This allows to have multiple Disabled group, e.g. Disabled/Disabled_control, and thus eases experimentation.

TBR=sky@chromium.org
BUG=465815

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

Cr-Commit-Position: refs/heads/master@{#324099}
(cherry picked from commit e8443fe8937b699b3847adc2c135587a382084a8)

Add experiment to disable loading of background tabs during session restore.

BUG=465815

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

Cr-Commit-Position: refs/heads/master@{#324041}
(cherry picked from commit fbcd45d1f21b87e0b70111fded7c805db06a43ea)

Merge commit 'refs/branch-heads/2357' of https://chromium.googlesource.com/a/chromium/src into drover_2357

Revert 4 patches that deal with Extension ScriptContexts that have been submitted very recently.

There are high crash rates caused by invalid ScriptContexts and it's unclear
which of these patches is causing them - potentially all of them. Reverting all
to be safe, and because they stomped on each other and can't be reverted
separately.

Revert "Move Extension ScriptContext creation into ScriptContextSet."

This reverts commit 745b66237eca67b22225941eb475ba8a995e1287.

Revert "[Extensions] extension sendMessage respect to ActiveDOMObject policy"

This reverts commit 441ece58d63d2bf6e1f82e4055c71ef2f2ef63f4.

Revert "Add back the call to extensions::ScriptContext::DispatchOnUnloadEvent."

This reverts commit 0eda971a264a38756cc07416b1d1943b7e324aca.

Revert "[Extensions] Fix crash in ScriptContextSet"

This reverts commit a08a3109cc17941e39eb54b4d4223cfc14de83ae.

BUG=471599
TBR=rdevlin.cronin@chromium.org

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

(cherry picked from commit 62b5911d512673e84cf5b2c63e9b20ec5ad2c3b8)

Cr-Original-Commit-Position: refs/heads/master@{#323869}
Cr-Commit-Position: refs/branch-heads/2357@{#101}
Cr-Branched-From: 59d4494849b405682265ed5d3f5164573b9a939b-refs/heads/master@{#323860}

1 files changed, 48 insertions, 48 deletions

diff --git a/mojo/services/html_viewer/blink_resource_constants.h b/mojo/services/html_viewer/blink_resource_constants.h
index 6fc4ff1..fd571ba 100644
--- a/mojo/services/html_viewer/blink_resource_constants.h
+++ b/mojo/services/html_viewer/blink_resource_constants.h
@@ -16,63 +16,63 @@ struct DataResource {
 };
 
 const DataResource kDataResources[] = {
-    {"missingImage", IDR2_BROKENIMAGE},
+    {"missingImage", IDR_BROKENIMAGE},
     // Skipping missingImage@2x
-    {"mediaplayerPause", IDR2_MEDIAPLAYER_PAUSE_BUTTON},
-    {"mediaplayerPauseHover", IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER},
-    {"mediaplayerPauseDown", IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN},
-    {"mediaplayerPlay", IDR2_MEDIAPLAYER_PLAY_BUTTON},
-    {"mediaplayerPlayHover", IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER},
-    {"mediaplayerPlayDown", IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN},
-    {"mediaplayerPlayDisabled", IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED},
-    {"mediaplayerSoundLevel3", IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON},
-    {"mediaplayerSoundLevel3Hover", IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER},
-    {"mediaplayerSoundLevel3Down", IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN},
-    {"mediaplayerSoundLevel2", IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON},
-    {"mediaplayerSoundLevel2Hover", IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER},
-    {"mediaplayerSoundLevel2Down", IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN},
-    {"mediaplayerSoundLevel1", IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON},
-    {"mediaplayerSoundLevel1Hover", IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER},
-    {"mediaplayerSoundLevel1Down", IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN},
-    {"mediaplayerSoundLevel0", IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON},
-    {"mediaplayerSoundLevel0Hover", IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER},
-    {"mediaplayerSoundLevel0Down", IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN},
-    {"mediaplayerSoundDisabled", IDR2_MEDIAPLAYER_SOUND_DISABLED},
-    {"mediaplayerSliderThumb", IDR2_MEDIAPLAYER_SLIDER_THUMB},
-    {"mediaplayerSliderThumbHover", IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER},
-    {"mediaplayerSliderThumbDown", IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN},
-    {"mediaplayerVolumeSliderThumb", IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB},
+    {"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",
-     IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER},
+     IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER},
     {"mediaplayerVolumeSliderThumbDown",
-     IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN},
+     IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN},
     {"mediaplayerVolumeSliderThumbDisabled",
-     IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED},
-    {"mediaplayerClosedCaption", IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON},
+     IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED},
+    {"mediaplayerClosedCaption", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON},
     {"mediaplayerClosedCaptionHover",
-     IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER},
+     IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER},
     {"mediaplayerClosedCaptionDown",
-     IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN},
+     IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN},
     {"mediaplayerClosedCaptionDisabled",
-     IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED},
-    {"mediaplayerFullscreen", IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON},
-    {"mediaplayerFullscreenHover", IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER},
-    {"mediaplayerFullscreenDown", IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN},
-    {"mediaplayerCastOff", IDR2_MEDIAPLAYER_CAST_BUTTON_OFF},
-    {"mediaplayerCastOn", IDR2_MEDIAPLAYER_CAST_BUTTON_ON},
+     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",
-     IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED},
-    {"mediaplayerOverlayCastOff", IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF},
-    {"mediaplayerOverlayPlay", IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON},
-    {"panIcon", IDR2_PAN_SCROLL_ICON},
-    {"searchCancel", IDR2_SEARCH_CANCEL},
-    {"searchCancelPressed", IDR2_SEARCH_CANCEL_PRESSED},
-    {"searchMagnifier", IDR2_SEARCH_MAGNIFIER},
-    {"searchMagnifierResults", IDR2_SEARCH_MAGNIFIER_RESULTS},
-    {"textAreaResizeCorner", IDR2_TEXTAREA_RESIZER},
+     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", IDR2_PASSWORD_GENERATION_ICON},
-    {"generatePasswordHover", IDR2_PASSWORD_GENERATION_ICON_HOVER},
+    {"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},