| Index: base/base.gyp
 | 
| diff --git a/base/base.gyp b/base/base.gyp
 | 
| index fa4b00e1b318dafc4cd45de47811195522193c93..54ed4b7fa79e4d9e5905042120b10a1600cdea80 100644
 | 
| --- a/base/base.gyp
 | 
| +++ b/base/base.gyp
 | 
| @@ -247,21 +247,21 @@
 | 
|          'linux_util.h',
 | 
|          'md5.cc',
 | 
|          'md5.h',
 | 
| -        'message_pump_android.cc',
 | 
| -        'message_pump_android.h',
 | 
| -        'message_pump_glib.cc',
 | 
| -        'message_pump_glib.h',
 | 
| -        'message_pump_gtk.cc',
 | 
| -        'message_pump_gtk.h',
 | 
| -        'message_pump_io_ios.cc',
 | 
| -        'message_pump_io_ios.h',
 | 
| -        'message_pump_observer.h',
 | 
| -        'message_pump_aurax11.cc',
 | 
| -        'message_pump_aurax11.h',
 | 
| -        'message_pump_libevent.cc',
 | 
| -        'message_pump_libevent.h',
 | 
| -        'message_pump_mac.h',
 | 
| -        'message_pump_mac.mm',
 | 
| +        'message_loop/message_pump_android.cc',
 | 
| +        'message_loop/message_pump_android.h',
 | 
| +        'message_loop/message_pump_glib.cc',
 | 
| +        'message_loop/message_pump_glib.h',
 | 
| +        'message_loop/message_pump_gtk.cc',
 | 
| +        'message_loop/message_pump_gtk.h',
 | 
| +        'message_loop/message_pump_io_ios.cc',
 | 
| +        'message_loop/message_pump_io_ios.h',
 | 
| +        'message_loop/message_pump_observer.h',
 | 
| +        'message_loop/message_pump_aurax11.cc',
 | 
| +        'message_loop/message_pump_aurax11.h',
 | 
| +        'message_loop/message_pump_libevent.cc',
 | 
| +        'message_loop/message_pump_libevent.h',
 | 
| +        'message_loop/message_pump_mac.h',
 | 
| +        'message_loop/message_pump_mac.mm',
 | 
|          'metrics/field_trial.cc',
 | 
|          'metrics/field_trial.h',
 | 
|          'posix/file_descriptor_shuffle.cc',
 | 
| @@ -526,9 +526,9 @@
 | 
|          'message_loop/message_loop_proxy_impl_unittest.cc',
 | 
|          'message_loop/message_loop_proxy_unittest.cc',
 | 
|          'message_loop/message_loop_unittest.cc',
 | 
| -        'message_pump_glib_unittest.cc',
 | 
| -        'message_pump_io_ios_unittest.cc',
 | 
| -        'message_pump_libevent_unittest.cc',
 | 
| +        'message_loop/message_pump_glib_unittest.cc',
 | 
| +        'message_loop/message_pump_io_ios_unittest.cc',
 | 
| +        'message_loop/message_pump_libevent_unittest.cc',
 | 
|          'metrics/sample_map_unittest.cc',
 | 
|          'metrics/sample_vector_unittest.cc',
 | 
|          'metrics/bucket_ranges_unittest.cc',
 | 
| @@ -684,7 +684,7 @@
 | 
|              # Requires spawning processes.
 | 
|              ['exclude', '^metrics/stats_table_unittest\\.cc$'],
 | 
|              # iOS does not use message_pump_libevent.
 | 
| -            ['exclude', '^message_pump_libevent_unittest\\.cc$'],
 | 
| +            ['exclude', '^message_loop/message_pump_libevent_unittest\\.cc$'],
 | 
|            ],
 | 
|            'conditions': [
 | 
|              ['coverage != 0', {
 | 
| @@ -746,12 +746,12 @@
 | 
|            ],
 | 
|          }, {  # use_glib!=1
 | 
|            'sources!': [
 | 
| -            'message_pump_glib_unittest.cc',
 | 
| +            'message_loop/message_pump_glib_unittest.cc',
 | 
|            ]
 | 
|          }],
 | 
|          ['use_ozone == 1', {
 | 
|            'sources!': [
 | 
| -            'message_pump_glib_unittest.cc',
 | 
| +            'message_loop/message_pump_glib_unittest.cc',
 | 
|            ]
 | 
|          }],
 | 
|          ['OS == "win"', {
 | 
| @@ -764,7 +764,7 @@
 | 
|              'file_descriptor_shuffle_unittest.cc',
 | 
|              'files/dir_reader_posix_unittest.cc',
 | 
|              'threading/worker_pool_posix_unittest.cc',
 | 
| -            'message_pump_libevent_unittest.cc',
 | 
| +            'message_loop/message_pump_libevent_unittest.cc',
 | 
|            ],
 | 
|            # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
 | 
|            'msvs_disabled_warnings': [
 | 
| 
 |