Fix some files in chrome directory for Windows GN build.

chrome/browser/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//components/nacl/nacl_defines.gni")
 
 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
@@ skipping 467 matching lines @@
   }
 
   if (use_ash) {
     sources +=
         rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome")
   }
 
   if (use_x11) {
     sources +=
         rebase_path(gypi_values.chrome_browser_x11_sources, ".", "//chrome")
+  } else {
+    sources -= [ "password_manager/password_store_x.cc" ]
   }
   if (is_posix && !is_mac && !is_ios) {
     sources += [
       "//chrome/app/chrome_crash_reporter_client.cc",
       "//chrome/app/chrome_crash_reporter_client.h",
     ]
     deps += [
       "//components/crash/app",
       "//components/crash/browser",
     ]
@@ skipping 136 matching lines @@
         "google/did_run_updater_win.h",
       ]
     }
     public_deps += [
       "//ui/views",
       "//ui/views/controls/webview",
     ]
     deps += [
       "//chrome:version_header",
       "//chrome/installer/util:strings",
+      "//google_update",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
       "//third_party/wtl",
 
       #"chrome_process_finder",  TODO(GYP)
       #"../chrome_elf/chrome_elf.gyp:chrome_elf",  TODO(GYP)
       #"../chrome_elf/chrome_elf.gyp:chrome_elf_constants",  TODO(GYP)
       #"../chrome_elf/chrome_elf.gyp:dll_hash",  TODO(GYP)
-      #"../google_update/google_update.gyp:google_update",  TODO(GYP)
       "//ui/metro_viewer",
       "//win8:metro_viewer",
     ]
   } else {
     # Non-Windows.
     sources +=
         rebase_path(gypi_values.chrome_browser_non_win_sources, ".", "//chrome")
     if (toolkit_views) {
       deps += [
         "//ui/views",
@@ skipping 400 matching lines @@
     ]
   }
 
   if (enable_wifi_bootstrapping) {
     sources += [
       "local_discovery/wifi/mock_wifi_manager.cc",
       "local_discovery/wifi/mock_wifi_manager.h",
     ]
   }
 }