| Index: build/config/compiler/BUILD.gn | 
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | 
| index 66131c067aface76bafc756da5bcec17aef0498b..96d012d0e7d2717794341ca97d13265f249aa148 100644 | 
| --- a/build/config/compiler/BUILD.gn | 
| +++ b/build/config/compiler/BUILD.gn | 
| @@ -4,7 +4,6 @@ | 
|  | 
| import("//build/config/android/config.gni") | 
| import("//build/config/chrome_build.gni") | 
| -import("//build/config/chromecast_build.gni") | 
| import("//build/config/compiler/compiler.gni") | 
| import("//build/config/nacl/config.gni") | 
| import("//build/config/sanitizers/sanitizers.gni") | 
| @@ -1069,8 +1068,7 @@ config("chromium_code") { | 
| # the actual linker.  Make sure these warnings are treated as errors as | 
| # well. | 
| # TODO(thakis): Enable in use_custom_libcxx builds, crbug.com/669072 | 
| -      # TODO(thakis): Enable in chromecast builds, crbug.com/669076 | 
| -      if (!use_custom_libcxx && !is_chromecast) { | 
| +      if (!use_custom_libcxx) { | 
| ldflags = [ "-Werror" ] | 
| } | 
| } | 
| @@ -1131,8 +1129,7 @@ config("no_chromium_code") { | 
| cflags += [ "-Werror" ] | 
|  | 
| # TODO(thakis): Enable in use_custom_libcxx builds, crbug.com/669072 | 
| -      # TODO(thakis): Enable in chromecast builds, crbug.com/669076 | 
| -      if (!use_custom_libcxx && !is_chromecast) { | 
| +      if (!use_custom_libcxx) { | 
| ldflags = [ "-Werror" ] | 
| } | 
| } | 
|  |