Revert 85732 (broke build) - Move SystemMonitor to base/.

app/app.gyp

 # Copyright (c) 2010 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': {
     'chromium_code': 1,
   },
   'includes': [
     'app_base.gypi',
@@ skipping 23 matching lines @@
         '../ui/base/animation/multi_animation_unittest.cc',
         '../ui/base/animation/slide_animation_unittest.cc',
         '../ui/base/clipboard/clipboard_unittest.cc',
         '../ui/base/dragdrop/os_exchange_data_win_unittest.cc',
         '../ui/base/l10n/l10n_util_mac_unittest.mm',
         '../ui/base/l10n/l10n_util_unittest.cc',
         '../ui/base/models/tree_node_iterator_unittest.cc',
         '../ui/base/models/tree_node_model_unittest.cc',
         '../ui/base/resource/data_pack_unittest.cc',
         '../ui/base/resource/resource_bundle_unittest.cc',
+        '../ui/base/system_monitor/system_monitor_unittest.cc',
         '../ui/base/test/data/resource.h',
         '../ui/base/text/text_elider_unittest.cc',
         '../ui/base/view_prop_unittest.cc',
         'run_all_unittests.cc',
         'sql/connection_unittest.cc',
         'sql/sqlite_features_unittest.cc',
         'sql/statement_unittest.cc',
         'sql/transaction_unittest.cc',
         'test_suite.cc',
         'test_suite.h',
@@ skipping 48 matching lines @@
       'includes': [ '../build/grit_target.gypi' ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: