[win] Change Chrome Watcher configuration API.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 2881 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'test_support_common',
       ],
       'include_dirs': [
         '..',
       ],
       '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 148 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }