[win] Change Chrome Watcher configuration API.

chrome/test/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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
@@ skipping 2099 matching lines @@
   }
 }
 
 if (is_win || (is_linux && !is_chromeos)) {
   # TODO(GYP): Figure out which of these work and are needed on other
   # platforms.
   test("chrome_app_unittests") {
     sources = [
       "../app/chrome_watcher_client_unittest_win.cc",
       "../app/chrome_watcher_client_win.cc",
-      "../app/chrome_watcher_command_line_unittest_win.cc",
       "../app/chrome_watcher_command_line_win.cc",
+      "../app/chrome_watcher_command_line_win_unittest.cc",
       "../app/delay_load_hook_unittest_win.cc",
       "../app/delay_load_hook_win.cc",
       "../app/delay_load_hook_win.h",
       "../app/resources/resources_unittest.cc",
       "../app/signature_validator_win.cc",
       "../app/signature_validator_win.h",
       "../app/signature_validator_win_unittest.cc",
       "../common/crash_keys.cc",
       "../common/crash_keys.h",
     ]
@@ skipping 96 matching lines @@
 if (is_android) {
   android_library("unit_tests_java") {
     DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
     deps = [
       "//base:base_java",
       "//chrome/android:chrome_java",
       "//content/public/android:content_java",
     ]
   }
 }