Fix GN win build.

Fixes some minor GN build issues on Windows

TBR=scottmg@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271159 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 21 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 3bbd897..53b236d 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -810,12 +810,13 @@ component("base") {
       "sha1_win.cc",
     ]
 
-    if (is_component_build) {
-      sources -= [ "debug/debug_on_start_win.cc" ]
-    }
-
-    # Needed by win_util.h
-    libs = [ "netapi32.lib" ]
+    libs = [
+      "netapi32.lib",
+      "powrprof.lib",
+    ]
+    ldflags = [
+      "/DELAYLOAD:powrprof.dll",
+    ]
   } else if (!is_nacl) {
     # Non-Windows.
     deps += [ "//third_party/libevent" ]
@@ -967,7 +968,6 @@ source_set("prefs") {
     "prefs/value_map_pref_store.cc",
     "prefs/value_map_pref_store.h",
     "prefs/writeable_pref_store.h",
-
   ]
 
   defines = [ "BASE_PREFS_IMPLEMENTATION" ]
@@ -1109,7 +1109,6 @@ test("base_unittests") {
     "message_loop/message_loop_unittest.cc",
     "message_loop/message_pump_glib_unittest.cc",
     "message_loop/message_pump_io_ios_unittest.cc",
-    "message_loop/message_pump_libevent_unittest.cc",
     "metrics/sample_map_unittest.cc",
     "metrics/sample_vector_unittest.cc",
     "metrics/bucket_ranges_unittest.cc",
@@ -1251,7 +1250,6 @@ test("base_unittests") {
 
   if (is_ios) {
     sources -= [
-      "message_loop/message_pump_libevent_unittest.cc",  # libevent not used.
       "metrics/stats_table_uinittest.cc",  # Requires spawning a process.
       "process/memory_unittest.cc",
       "process/memory_unittest_mac.h",
@@ -1285,16 +1283,8 @@ test("base_unittests") {
     sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
   }
 
-  if (is_win) {
-    sources -= [
-      "file_descriptor_shuffle_unittest.cc",
-      "files/dir_reader_posix_unittest.cc",
-      "threading/worker_pool_posix_unittest.cc",
-      "message_loop/message_pump_libevent_unittest.cc",
-    ]
-  }
-
-  if (!is_win || is_ios) {
+  if (is_posix || is_ios) {
+    sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
     deps += [ "//third_party/libevent" ]
   }
 
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn
index 63ce93c..ac29edf 100644
--- a/base/allocator/BUILD.gn
+++ b/base/allocator/BUILD.gn
@@ -34,6 +34,7 @@ if (!is_android) {
       # We don't list dynamic_annotations.c since its copy is already
       # present in the dynamic_annotations target.
       "$tcmalloc_dir/src/base/elf_mem_image.cc",
+      "$tcmalloc_dir/src/base/elf_mem_image.h",
       "$tcmalloc_dir/src/base/linuxthreads.cc",
       "$tcmalloc_dir/src/base/linuxthreads.h",
       "$tcmalloc_dir/src/base/logging.cc",
@@ -150,7 +151,7 @@ if (!is_android) {
         "$tcmalloc_dir/src/profile-handler.h",
         "$tcmalloc_dir/src/profiler.cc",
       ]
-      defines = [ "PERFTOOLS_DLL_DECL=" ]
+      defines += [ "PERFTOOLS_DLL_DECL=" ]
     }
     if (is_linux || is_android) {
       sources -= [
diff --git a/tools/gn/secondary/third_party/nss/BUILD.gn b/tools/gn/secondary/third_party/nss/BUILD.gn
index 61fbd2a..6ce1d2f 100644
--- a/tools/gn/secondary/third_party/nss/BUILD.gn
+++ b/tools/gn/secondary/third_party/nss/BUILD.gn
@@ -359,7 +359,7 @@ if (is_linux) {
         cflags = [ "-all_load" ]
       } else if (is_win) {
         # Pass the def file to the linker.
-        ldflags += [ rebase_path("nss/exports_win.def", root_build_dir) ]
+        ldflags = [ rebase_path("nss/exports_win.def", root_build_dir) ]
       }
     }