content_shell fixes for gn

content/shell/BUILD.gn

Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index caf5ad90d9234a222de8b06bf3929afc15069b75..47fc5d9b7a1d1bf06136fbb342ac8da5c58c0272 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -268,7 +268,6 @@ static_library("content_shell_lib") {
   }
 
   if (is_win) {
-    #'LinkIncremental': '<(msvs_large_module_debug_link_mode)',  TODO(GYP)
     sources += [
       "common/v8_breakpad_support_win.cc",
       "common/v8_breakpad_support_win.h",
@@ -443,13 +442,14 @@ if (is_android) {
     testonly = true
 
     # TODO(GYP) mac resource bundle stuff for this target.
-    # TODO(GYP) Windows content shell settings:
-    #  - RC file.
-    #  - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
     sources = [
       "app/shell_main.cc",
     ]
 
+    if (is_win) {
+      sources += [ "app/shell.rc" ]
+    }
+
     defines = []
 
     deps = [
@@ -461,6 +461,11 @@ if (is_android) {
 
     if (is_win) {
       deps += [ "//sandbox" ]
+
+      # This is a large module that can't do incremental linking in some cases.
+      configs -= [ "//build/config/win:default_incremental_linking" ]
+      configs +=
+          [ "//build/config/win:default_large_module_incremental_linking" ]
       if (win_console_app) {
         defines += [ "WIN_CONSOLE_APP" ]
       } else {