Revert 206507 "Move message_pump to base/message_loop."

trunk/src/base/base.gypi

 # Copyright (c) 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 283 matching lines @@
           'memory/singleton.cc',
           'memory/singleton.h',
           'memory/weak_ptr.cc',
           'memory/weak_ptr.h',
           'message_loop/message_loop.cc',
           'message_loop/message_loop.h',
           'message_loop/message_loop_proxy.cc',
           'message_loop/message_loop_proxy.h',
           'message_loop/message_loop_proxy_impl.cc',
           'message_loop/message_loop_proxy_impl.h',
-          'message_loop/message_pump.cc',
-          'message_loop/message_pump.h',
-          'message_loop/message_pump_android.cc',
-          'message_loop/message_pump_android.h',
-          'message_loop/message_pump_default.cc',
-          'message_loop/message_pump_default.h',
-          'message_loop/message_pump_ozone.cc',
-          'message_loop/message_pump_ozone.h',
-          'message_loop/message_pump_win.cc',
-          'message_loop/message_pump_win.h',
+          'message_pump.cc',
+          'message_pump.h',
+          'message_pump_android.cc',
+          'message_pump_android.h',
+          'message_pump_default.cc',
+          'message_pump_default.h',
+          'message_pump_ozone.cc',
+          'message_pump_ozone.h',
+          'message_pump_win.cc',
+          'message_pump_win.h',
           'metrics/sample_map.cc',
           'metrics/sample_map.h',
           'metrics/sample_vector.cc',
           'metrics/sample_vector.h',
           'metrics/bucket_ranges.cc',
           'metrics/bucket_ranges.h',
           'metrics/histogram.cc',
           'metrics/histogram.h',
           'metrics/histogram_base.cc',
           'metrics/histogram_base.h',
@@ skipping 317 matching lines @@
         'msvs_disabled_warnings': [
           4018,
         ],
         'target_conditions': [
           ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
               'sources/': [
                 ['exclude', '^nix/'],
               ],
               'sources!': [
                 'atomicops_internals_x86_gcc.cc',
-                'message_loop/message_pump_glib.cc',
-                'message_loop/message_pump_aurax11.cc',
+                'message_pump_glib.cc',
+                'message_pump_aurax11.cc',
               ],
           }],
           ['<(toolkit_uses_gtk)==0 or >(nacl_untrusted_build)==1', {
-            'sources!': ['message_loop/message_pump_gtk.cc'],
+            'sources!': ['message_pump_gtk.cc'],
           }],
           ['(OS != "linux" and <(os_bsd) != 1 and OS != "android") or >(nacl_untrusted_build)==1', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
                 'linux_util.cc',
               ],
             },
           ],
           ['>(nacl_untrusted_build)==1', {
             'sources!': [
@@ skipping 62 matching lines @@
               ['include', '^base_paths_mac\\.'],
               ['include', '^file_util_mac\\.'],
               ['include', '^file_version_info_mac\\.'],
               ['include', '^mac/bundle_locations\\.'],
               ['include', '^mac/foundation_util\\.'],
               ['include', '^mac/mac_logging\\.'],
               ['include', '^mac/objc_property_releaser\\.'],
               ['include', '^mac/scoped_mach_port\\.'],
               ['include', '^mac/scoped_nsautorelease_pool\\.'],
               ['include', '^memory/discardable_memory_mac\\.'],
-              ['include', '^message_loop/message_pump_mac\\.'],
+              ['include', '^message_pump_mac\\.'],
               ['include', '^threading/platform_thread_mac\\.'],
               ['include', '^strings/sys_string_conversions_mac\\.'],
               ['include', '^time_mac\\.'],
               ['include', '^worker_pool_mac\\.'],
               # Exclude all process_util except the minimal implementation
               # needed on iOS (mostly for unit tests).
               ['exclude', '^process_util'],
               ['include', '^process_util_ios\\.mm$'],
             ],
             'sources!': [
-              'message_loop/message_pump_libevent.cc'
+              'message_pump_libevent.cc'
             ],
           }],
           ['OS == "ios" and _toolset == "host"', {
             'sources/': [
               # Copied filename_rules to switch from iOS to Mac inclusions.
               ['include', '_(cocoa|mac)(_unittest)?\\.(h|cc|mm?)$'],
               ['include', '(^|/)(cocoa|mac)/'],
               ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'],
               ['exclude', '(^|/)ios/'],
             ]
@@ skipping 22 matching lines @@
             },
           ],
           ['OS == "win" and >(nacl_untrusted_build)==0', {
             'include_dirs': [
               '<(DEPTH)/third_party/wtl/include',
             ],
             'sources!': [
               'event_recorder_stubs.cc',
               'files/file_path_watcher_kqueue.cc',
               'files/file_path_watcher_stub.cc',
-              'message_loop/message_pump_libevent.cc',
+              'message_pump_libevent.cc',
               'posix/file_descriptor_shuffle.cc',
               # Not using sha1_win.cc because it may have caused a
               # regression to page cycler moz.
               'sha1_win.cc',
               'strings/string16.cc',
             ],
           },],
           ['<(use_ozone) == 1', {
             'sources!': [
-              'message_loop/message_pump_glib.cc',
-              'message_loop/message_pump_aurax11.cc',
+              'message_pump_glib.cc',
+              'message_pump_aurax11.cc',
             ]
           }],
           ['OS == "linux" and >(nacl_untrusted_build)==0', {
             'sources!': [
               'files/file_path_watcher_kqueue.cc',
               'files/file_path_watcher_stub.cc',
             ],
           }],
           ['(OS == "mac" or OS == "ios") and >(nacl_untrusted_build)==0', {
             'sources/': [
@@ skipping 26 matching lines @@
           ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', {
             'sources/': [
               ['exclude', '^third_party/nspr/'],
             ],
           }],
         ],
       }],
     ],
   },
 }