extensions: Combine extensions_pak with app_shell_pak
commit02b2c90e60f69349bb300134539dca37a398cacd
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Wed, 30 Jul 2014 16:34:40 +0000 (30 16:34 +0000)
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Wed, 30 Jul 2014 16:34:40 +0000 (30 16:34 +0000)
treeaf938cebc68e94ed1c4c9fd7e86489b46b00b035
parentce49c9e780ed54eafb35d39b13eabe4fe3176392
extensions: Combine extensions_pak with app_shell_pak

Use the same .pak file for both app_shell and
extensions_unittests by merging app_shell_pak into extensions_pak.

BUG=397250,394469
TEST=extensions_unittests and app_shell
R=jamescook@chromium.org
TBR=yoz@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286536 0039d316-1c4b-4281-b951-d872f2087c98
athena/resources/athena_resources.gyp
extensions/extensions.gyp
extensions/shell/app/shell_main_delegate.cc
extensions/shell/app_shell.gyp
extensions/shell/app_shell_resources.gyp [new file with mode: 0644]
extensions/test/extensions_unittests_main.cc