GN: Fix build after r289163 / r289149.

GN: Fix build after r289163 / r289149.

TBR=brettw@chromium.org
NOTRY=true
NOTREECHECKS=true

[Lei Zhang, 2014-08-13 07:05:13]

I'm confused how things passed CQ. This fixes things at ToT for me after I
clobbered my out/gn_build dir.

[zerny-chromium, 2014-08-13 08:01:44]

On 2014/08/13 07:05:13, Lei Zhang wrote:
> I'm confused how things passed CQ. This fixes things at ToT for me after I
> clobbered my out/gn_build dir.

Could this be TBR'ed since the build is currently broken? It would be nice to
open the tree again.

[zerny-chromium, 2014-08-13 08:25:12]

On 2014/08/13 08:01:44, zerny-chromium wrote:
> On 2014/08/13 07:05:13, Lei Zhang wrote:
> > I'm confused how things passed CQ. This fixes things at ToT for me after I
> > clobbered my out/gn_build dir.
> 
> Could this be TBR'ed since the build is currently broken? It would be nice to
> open the tree again.

r289209 reverted the patch that broke GN.

[zerny-chromium, 2014-08-13 08:32:30]

On 2014/08/13 08:25:12, zerny-chromium wrote:
> On 2014/08/13 08:01:44, zerny-chromium wrote:
> > On 2014/08/13 07:05:13, Lei Zhang wrote:
> > > I'm confused how things passed CQ. This fixes things at ToT for me after I
> > > clobbered my out/gn_build dir.
> > 
> > Could this be TBR'ed since the build is currently broken? It would be nice
to
> > open the tree again.
> 
> r289209 reverted the patch that broke GN.

Nope, r289209 does not seem to fix the GN build. Still waiting on this fix.

[zerny-chromium, 2014-08-13 08:47:01]

The CQ bit was checked by zerny@chromium.org

[commit-bot: I haz the power, 2014-08-13 08:53:18]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/467023003/1

[commit-bot: I haz the power, 2014-08-13 09:00:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-13 09:00:05]

Failed to apply patch for extensions/BUILD.gn:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file extensions/BUILD.gn
  Hunk #1 FAILED at 82.
  1 out of 1 hunk FAILED -- saving rejects to file extensions/BUILD.gn.rej

Patch:       extensions/BUILD.gn
Index: extensions/BUILD.gn
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index
f8fee97922b44222c73e6b5b5896ff0e682b8d1f..011221e8c417e15fa3b1a34ee8144e066f3787b1
100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -82,12 +82,12 @@ source_set("test_support") {
 # GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak
 repack("shell_and_test_pak") {
   sources = [
-    "$root_gen_dir/chrome/common/common_resources.pak",
-    "$root_gen_dir/chrome/common/extensions_api_resources.pak",
+    "$root_gen_dir/chrome/common_resources.pak",
+    "$root_gen_dir/chrome/extensions_api_resources.pak",
     # TODO(jamescook): Extract the extension/app related resources
     # from generated_resources_en-US.pak. http://crbug.com/397250
     "$root_gen_dir/chrome/generated_resources_en-US.pak",
-    "$root_gen_dir/chrome/renderer/renderer_resources_100_percent.pak",
+    "$root_gen_dir/chrome/renderer_resources_100_percent.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/content/shell/shell_resources.pak",
     "$root_gen_dir/extensions/extensions_renderer_resources.pak",

[zerny-chromium, 2014-08-13 11:26:08]

Relanded this in https://codereview.chromium.org/468733003/ together with the
reverted CL https://codereview.chromium.org/467023003/

[zerny-chromium, 2014-08-13 11:28:23]

On 2014/08/13 11:26:08, zerny-chromium wrote:
> Relanded this in https://codereview.chromium.org/468733003/ together with the
> reverted CL https://codereview.chromium.org/467023003/

Rather, the reverted CL is: https://codereview.chromium.org/454253004/

[tfarina, 2014-08-13 13:18:29]

Cool! Thanks for fixing this Lei!

I was trying to fix it here -> https://codereview.chromium.org/464203002/