Update .gn file with upstream as well.
diff --git a/.gn b/.gn
index 853c59a..d3f9ffe 100644
--- a/.gn
+++ b/.gn
@@ -17,27 +17,185 @@
 check_targets = [
   #"//apps/*",  # Medium-hard.
   #"//ash/*",  # Medium-hard.
-  #"//base/*",  # Needs GN binary changes to work on Android.
+  "//base/*",
   "//blink/*",
   "//breakpad/*",
   "//build/*",
   "//cc/*",
 
   #"//chrome/*",  # Epic number of errors.
+  "//chrome/common/*",
+  "//chrome/installer/*",
+  "//chrome/third_party/mozilla_security_manager/*",
   "//chromecast/*",
 
   # TODO(brettw): Fix http://crbug.com/460828 and uncomment the following
   # line.
   #"//chrome_elf/*",
-  "//cloud_print/*",
+  #"//cloud_print/*",
 
-  #"//components/*",  # Lots of errors.
+  #"//components/*",  # Needs nacl below.
+  "//components:*",
+  "//components/about_handler/*",
+  "//components/about_ui/*",
+  "//components/app_modal/*",
+  "//components/audio_modem/*",
+  "//components/autofill/*",
+  "//components/auto_login_parser/*",
+  "//components/bitmap_uploader/*",
+  "//components/bookmarks/*",
+  "//components/browser_sync/*",
+  "//components/browser_watcher/*",
+  "//components/browsing_data/*",
+  "//components/bubble/*",
+  "//components/captive_portal/*",
+  "//components/cdm/*",
+  "//components/certificate_reporting/*",
+  "//components/certificate_transparency/*",
+  "//components/chrome_apps/*",
+  "//components/clipboard/*",
+  "//components/cloud_devices/*",
+  "//components/component_updater/*",
+  "//components/compression/*",
+  "//components/constrained_window/*",
+  "//components/content_settings/*",
+  "//components/cookie_config/*",
+  "//components/copresence/*",
+  "//components/crash/*",
+  "//components/cronet/*",
+  "//components/crx_file/*",
+  "//components/data_reduction_proxy/*",
+  "//components/data_usage/*",
+  "//components/data_use_measurement/*",
+  "//components/device_event_log/*",
+  "//components/devtools_discovery/*",
+  "//components/devtools_http_handler/*",
+  "//components/devtools_service/*",
+  "//components/dom_distiller/*",
+  "//components/domain_reliability/*",
+  "//components/drive/*",
+  "//components/enhanced_bookmarks/*",
+  "//components/error_page/*",
+  "//components/exp/*",
+  "//components/external_video_surface/*",
+  "//components/favicon/*",
+  "//components/favicon_base/*",
+  "//components/feedback/*",
+  "//components/filesystem/*",
+  "//components/flags_ui/*",
+  "//components/font_service/*",
+  "//components/gcm_driver/*",
+  "//components/google/*",
+  "//components/gpu/*",
+  "//components/guest_view/*",
+  "//components/handoff/*",
+  "//components/history/*",
+  "//components/html_viewer/*",
+  "//components/infobars/*",
+  "//components/invalidation/*",
+  "//components/json_schema/*",
+  "//components/keyed_service/*",
+  "//components/language_usage_metrics/*",
+  "//components/leveldb_proto/*",
+  "//components/login/*",
+  "//components/memory_pressure/*",
+  "//components/message_port/*",
+  "//components/metrics/*",
+  "//components/metrics_services_manager/*",
+  "//components/mime_util/*",
+  "//components/mus/*",
+  "//components/nacl/*",
+  "//components/navigation_interception/*",
+  "//components/navigation_metrics/*",
+  "//components/net_log/*",
+  "//components/network_hints/*",
+  "//components/network_time/*",
+  "//components/offline_pages/*",
+  "//components/omnibox/*",
+  "//components/onc/*",
+  "//components/open_from_clipboard/*",
+  "//components/os_crypt/*",
+  "//components/ownership/*",
+  "//components/packed_ct_ev_whitelist/*",
+  "//components/page_load_metrics/*",
+  "//components/pairing/*",
+  "//components/password_manager/*",
+  "//components/pdf/*",
+  "//components/pdf_viewer/*",
+  "//components/plugins/*",
+  "//components/policy/*",
+  "//components/power/*",
+  "//components/precache/*",
+  "//components/pref_registry/*",
+  "//components/printing/*",
+  "//components/proximity_auth/*",
+  "//components/proxy_config/*",
+  "//components/query_parser/*",
+  "//components/rappor/*",
+  "//components/renderer_context_menu/*",
+  "//components/resource_provider/*",
+  "//components/resources/*",
+  "//components/rlz/*",
+  "//components/safe_browsing_db/*",
+  "//components/safe_json/*",
+  "//components/scheduler/*",
+  "//components/search/*",
+  "//components/search_engines/*",
+  "//components/search_provider_logos/*",
+  "//components/security_interstitials/*",
+  "//components/service_tab_launcher/*",
+  "//components/session_manager/*",
+  "//components/sessions/*",
+  "//components/signin/*",
+  "//components/ssl_config/*",
+  "//components/ssl_errors/*",
+  "//components/startup_metric_utils/*",
+  "//components/storage_monitor/*",
+  "//components/strings/*",
+  "//components/suggestions/*",
+  "//components/sync_bookmarks/*",
+  "//components/sync_driver/*",
+  "//components/sync_sessions/*",
+  "//components/syncable_prefs/*",
+  "//components/test/*",
+  "//components/test_runner/*",
+  "//components/timers/*",
+  "//components/toolbar/*",
+  "//components/tools/*",
+  "//components/tracing/*",
+  "//components/translate/*",
+  "//components/ui/*",
+  "//components/undo/*",
+  "//components/update_client/*",
+  "//components/upload_list/*",
+  "//components/url_formatter/*",
+  "//components/url_matcher/*",
+  "//components/user_manager/*",
+  "//components/user_prefs/*",
+  "//components/variations/*",
+  "//components/visitedlink/*",
+  "//components/wallpaper/*",
+  "//components/web_cache/*",
+  "//components/web_modal/*",
+  "//components/web_resource/*",
+  "//components/web_view/*",
+  "//components/webcrypto/*",
+  "//components/webdata/*",
+  "//components/webdata_services/*",
+  "//components/webp_transcode/*",
+  "//components/webui_generator/*",
+  "//components/webusb/*",
+  "//components/wifi/*",
+
   #"//content/*",  # A whole lot of errors.
+  "//content/public/common:result_codes",
+  "//content/public/common:static_switches",
   "//courgette/*",
   "//crypto/*",
   "//data/*",
   "//dbus/*",
-  "//device/*",
+
+  #"//device/*",  # Ran into http://crbug.com/500761 adding dbus dependency
 
   #"//extensions/*",  # Lots of errors.
   #"//gin/*",  # Easy.
@@ -45,12 +203,18 @@
   "//google_update/*",
 
   #"//gpu/*",  # Lots of errors.
+  "//gpu:*",
+
   #"//ios/*",
   "//ipc/*",
 
   #"//jingle/*",
+  "//mandoline/*",
+  "//mash/*",
+
   #"//media/*",  # Lots of errors.
-  #"//mojo/*",
+  "mojo/*",
+
   #"//native_client/*",
   #"//net/*",  # Needs GN binary changes to work on Android.
 
@@ -74,14 +238,15 @@
   #"//ui/*",  # Just a few problems.
   "//url/*",
   "//v8/*",
+  "//win8/*",
 ]
 
 # These are the list of GN files that run exec_script. This whitelist exists
 # to force additional review for new uses of exec_script, which is strongly
 # discouraged except for gypi_to_gn calls.
 exec_script_whitelist = [
+  "//android_webview/BUILD.gn",
   "//ash/BUILD.gn",
-  "//build/config/android/BUILD.gn",
   "//build/config/android/config.gni",
   "//build/config/android/internal_rules.gni",
   "//build/config/android/rules.gni",
@@ -91,16 +256,23 @@
   "//build/config/linux/BUILD.gn",
   "//build/config/linux/pkg_config.gni",
   "//build/config/mac/mac_sdk.gni",
+  "//build/config/posix/BUILD.gn",
+  "//build/config/win/BUILD.gn",
   "//build/config/win/visual_studio_version.gni",
   "//build/gn_helpers.py",
   "//build/gypi_to_gn.py",
+  "//build/linux/BUILD.gn",
   "//build/toolchain/gcc_toolchain.gni",
   "//build/toolchain/mac/BUILD.gn",
+  "//build/toolchain/nacl/BUILD.gn",
   "//build/toolchain/win/BUILD.gn",
+  "//build/util/version.gni",
   "//chrome/android/BUILD.gn",
   "//chrome/browser/BUILD.gn",
   "//chrome/browser/chromeos/BUILD.gn",
   "//chrome/browser/extensions/BUILD.gn",
+  "//chrome/browser/resources/chromeos/chromevox/BUILD.gn",
+  "//chrome/browser/media/router/BUILD.gn",
   "//chrome/browser/ui/BUILD.gn",
   "//chrome/chrome_tests.gni",
   "//chrome/common/BUILD.gn",
@@ -113,11 +285,10 @@
   # TODO(dgn): Layer violation but breaks the build otherwise, see
   # https://crbug.com/474506
   "//clank/java/BUILD.gn",
-  "//clank/native/framework/BUILD.gn",
+  "//clank/native/BUILD.gn",
 
   "//components/domain_reliability/BUILD.gn",
   "//components/scheduler/scheduler.gni",
-  "//components/webui_generator/generator/wug.gni",
   "//content/browser/browser.gni",
   "//content/child/child.gni",
   "//content/common/common.gni",
@@ -125,26 +296,15 @@
   "//content/public/android/BUILD.gn",
   "//content/renderer/renderer.gni",
   "//content/test/BUILD.gn",
+  "//content/utility/utility.gni",
   "//extensions/common/api/schemas.gni",
   "//extensions/extensions.gni",
   "//extensions/shell/app_shell.gni",
   "//extensions/shell/common/api/schemas.gni",
   "//google_apis/BUILD.gn",
   "//gpu/gles2_conform_support/BUILD.gn",
+  "//gpu/khronos_glcts_support/BUILD.gn",
   "//jingle/BUILD.gn",
-  "//native_client/build/toolchain/gcc_toolchain.gni",
-  "//native_client/build/toolchain/nacl/BUILD.gn",
-  "//native_client/build/config/android/BUILD.gn",
-  "//native_client/build/config/gcc/gcc_version.gni",
-  "//native_client/build/config/ios/ios_sdk.gni",
-  "//native_client/build/config/linux/BUILD.gn",
-  "//native_client/build/config/linux/pkg_config.gni",
-  "//native_client/build/config/mac/mac_sdk.gni",
-  "//native_client/build/config/win/visual_studio_version.gni",
-  "//native_client/build/toolchain/gcc_toolchain.gni",
-  "//native_client/build/toolchain/mac/BUILD.gn",
-  "//native_client/build/toolchain/nacl/BUILD.gn",
-  "//native_client/build/toolchain/win/BUILD.gn",
   "//net/BUILD.gn",
   "//ppapi/ppapi_sources.gni",
   "//printing/BUILD.gn",
@@ -152,9 +312,12 @@
   "//remoting/remoting_srcs.gni",
   "//remoting/remoting_version.gni",
   "//skia/BUILD.gn",
+  "//sync/protocol/protocol_sources.gni",
   "//third_party/android_platform/BUILD.gn",
   "//third_party/angle/BUILD.gn",
+  "//third_party/angle/src/tests/BUILD.gn",
   "//third_party/boringssl/BUILD.gn",
+  "//third_party/catapult/tracing/BUILD.gn",
   "//third_party/cld_2/BUILD.gn",
   "//third_party/cython/rules.gni",
   "//third_party/google_input_tools/inputview.gni",
@@ -171,6 +334,7 @@
   "//third_party/WebKit/Source/platform/platform.gni",
   "//third_party/WebKit/Source/web/BUILD.gn",
   "//third_party/WebKit/Source/wtf/BUILD.gn",
+  "//third_party/WebKit/public/BUILD.gn",
   "//tools/gn/BUILD.gn",
   "//tools/gn/build_settings.h",
   "//tools/gn/command_help.cc",
@@ -185,5 +349,6 @@
   "//tools/gn/misc/emacs/gn.el",
   "//tools/gn/misc/vim/syntax/gn.vim",
   "//tools/gn/setup.cc",
+  "//ui/accessibility/BUILD.gn",
   "//ui/views/BUILD.gn",
 ]