Move webkit resources over to content.

athena/resources/athena_resources.gyp

Index: athena/resources/athena_resources.gyp
diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp
index 8d9769c0226f30d5df87d54ac4926c3c8e5e6fb7..15f05fd5c3f6f6c3801d499e0019ead4b144988a 100644
--- a/athena/resources/athena_resources.gyp
+++ b/athena/resources/athena_resources.gyp
@@ -29,11 +29,11 @@
       'type': 'none',
       'dependencies': [
         '../../ash/ash_resources.gyp:ash_resources',
+        '../../content/app/resources/content_resources.gyp:content_resources',
         '../../content/app/strings/content_strings.gyp:content_strings',
         '../../extensions/extensions.gyp:extensions_shell_and_test_pak',
         '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
         '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
-        '../../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
         'athena_resources',
       ],
       'actions': [{
@@ -43,10 +43,10 @@
             '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_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)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
           ],
           'pak_output': '<(PRODUCT_DIR)/athena_resources.pak',
         },