Move webkit resources over to content.

ui/base/resource/resource_bundle_mac.mm

Index: ui/base/resource/resource_bundle_mac.mm
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index 56d16d5ed64fc45cab265597be2b4032e5da1840..6ad6b1afbdcc1d11975020dcee3d1b09576c9c9f 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -51,16 +51,17 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
                         nil), SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
+  AddDataPackFromPath(GetResourcesPakFilePath(@"content_resources_100_percent",
                         nil), SCALE_FACTOR_100P);
 
   // On Mac we load 1x and 2x resources and we let the UI framework decide
   // which one to use.
   if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
-    AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent",
-                          nil), SCALE_FACTOR_200P);
-    AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_200_percent",
-                          nil), SCALE_FACTOR_200P);
+    AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent", nil),
+                        SCALE_FACTOR_200P);
+    AddDataPackFromPath(
+        GetResourcesPakFilePath(@"content_resources_200_percent", nil),

[tony, 2014/08/18 16:24:52]

I am still skeptical that Mac needs to load this file in addition to
chrome_200_percent.  Please investigate and figure out if it is necessary.

[Avi (use Gerrit), 2014/08/18 16:33:29]

Why do you say that? My understanding is that chrome_200_percent is for the
chrome stuff, and webkit_resources_200_percent is the blink-level stuff. Why
would the Mac not need the 200% stuff for the content?

+        SCALE_FACTOR_200P);
   }
 }