commit | b95ea55ccebda33f820d043e4b4dc85c10d7584d | [log] [tgz] |
---|---|---|
author | Kaido Kert <kaidokert@google.com> | Sat Oct 30 17:13:30 2021 -0700 |
committer | Kaido Kert <kaidokert@google.com> | Tue Nov 02 15:55:21 2021 -0700 |
tree | b08933ee5de31a0a4ab0ba8d9a71ecd35abe33e3 | |
parent | c52866be1febb1c09c04df4cb93d87f3595f4dc1 [diff] |
Unnest top-level src/ directory
diff --git a/src/.clang-format b/.clang-format similarity index 100% rename from src/.clang-format rename to .clang-format
diff --git a/src/.codespellignorelines b/.codespellignorelines similarity index 100% rename from src/.codespellignorelines rename to .codespellignorelines
diff --git a/.gitignore b/.gitignore index 7d0b5ff..1fc585f 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,3 +1,10 @@ -src/out/ -src/.vscode/ *.pyc +# Settings directory for eclipse +.settings/ +/buildbot +/gyp-mac-tool +/out +.vscode +.idea +/venv/* +_certs/
diff --git a/src/.gn b/.gn similarity index 100% rename from src/.gn rename to .gn
diff --git a/src/.pre-commit-config.yaml b/.pre-commit-config.yaml similarity index 100% rename from src/.pre-commit-config.yaml rename to .pre-commit-config.yaml
diff --git a/src/.pylintrc b/.pylintrc similarity index 100% rename from src/.pylintrc rename to .pylintrc
diff --git a/src/.style.yapf b/.style.yapf similarity index 100% rename from src/.style.yapf rename to .style.yapf
diff --git a/src/AUTHORS b/AUTHORS similarity index 100% rename from src/AUTHORS rename to AUTHORS
diff --git a/src/BUILD.gn b/BUILD.gn similarity index 100% rename from src/BUILD.gn rename to BUILD.gn
diff --git a/src/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from src/CONTRIBUTING.md rename to CONTRIBUTING.md
diff --git a/src/LICENSE b/LICENSE similarity index 100% rename from src/LICENSE rename to LICENSE
diff --git a/src/README.md b/README.md similarity index 100% rename from src/README.md rename to README.md
diff --git a/src/_env.py b/_env.py similarity index 100% rename from src/_env.py rename to _env.py
diff --git a/src/base/BUILD.gn b/base/BUILD.gn similarity index 100% rename from src/base/BUILD.gn rename to base/BUILD.gn
diff --git a/src/base/METADATA b/base/METADATA similarity index 100% rename from src/base/METADATA rename to base/METADATA
diff --git a/src/base/SECURITY_OWNERS b/base/SECURITY_OWNERS similarity index 100% rename from src/base/SECURITY_OWNERS rename to base/SECURITY_OWNERS
diff --git a/src/base/allocator/BUILD.gn b/base/allocator/BUILD.gn similarity index 100% rename from src/base/allocator/BUILD.gn rename to base/allocator/BUILD.gn
diff --git a/src/base/allocator/README.md b/base/allocator/README.md similarity index 100% rename from src/base/allocator/README.md rename to base/allocator/README.md
diff --git a/src/base/allocator/allocator_check.cc b/base/allocator/allocator_check.cc similarity index 100% rename from src/base/allocator/allocator_check.cc rename to base/allocator/allocator_check.cc
diff --git a/src/base/allocator/allocator_check.h b/base/allocator/allocator_check.h similarity index 100% rename from src/base/allocator/allocator_check.h rename to base/allocator/allocator_check.h
diff --git a/src/base/allocator/allocator_extension.cc b/base/allocator/allocator_extension.cc similarity index 100% rename from src/base/allocator/allocator_extension.cc rename to base/allocator/allocator_extension.cc
diff --git a/src/base/allocator/allocator_extension.h b/base/allocator/allocator_extension.h similarity index 100% rename from src/base/allocator/allocator_extension.h rename to base/allocator/allocator_extension.h
diff --git a/src/base/allocator/allocator_interception_mac.h b/base/allocator/allocator_interception_mac.h similarity index 100% rename from src/base/allocator/allocator_interception_mac.h rename to base/allocator/allocator_interception_mac.h
diff --git a/src/base/allocator/allocator_interception_mac.mm b/base/allocator/allocator_interception_mac.mm similarity index 100% rename from src/base/allocator/allocator_interception_mac.mm rename to base/allocator/allocator_interception_mac.mm
diff --git a/src/base/allocator/allocator_interception_mac_unittest.mm b/base/allocator/allocator_interception_mac_unittest.mm similarity index 100% rename from src/base/allocator/allocator_interception_mac_unittest.mm rename to base/allocator/allocator_interception_mac_unittest.mm
diff --git a/src/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc similarity index 100% rename from src/base/allocator/allocator_shim.cc rename to base/allocator/allocator_shim.cc
diff --git a/src/base/allocator/allocator_shim.h b/base/allocator/allocator_shim.h similarity index 100% rename from src/base/allocator/allocator_shim.h rename to base/allocator/allocator_shim.h
diff --git a/src/base/allocator/allocator_shim_default_dispatch_to_glibc.cc b/base/allocator/allocator_shim_default_dispatch_to_glibc.cc similarity index 100% rename from src/base/allocator/allocator_shim_default_dispatch_to_glibc.cc rename to base/allocator/allocator_shim_default_dispatch_to_glibc.cc
diff --git a/src/base/allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc b/base/allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc similarity index 100% rename from src/base/allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc rename to base/allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc
diff --git a/src/base/allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc b/base/allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc similarity index 100% rename from src/base/allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc rename to base/allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc
diff --git a/src/base/allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.h b/base/allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.h similarity index 100% rename from src/base/allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.h rename to base/allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.h
diff --git a/src/base/allocator/allocator_shim_default_dispatch_to_tcmalloc.cc b/base/allocator/allocator_shim_default_dispatch_to_tcmalloc.cc similarity index 100% rename from src/base/allocator/allocator_shim_default_dispatch_to_tcmalloc.cc rename to base/allocator/allocator_shim_default_dispatch_to_tcmalloc.cc
diff --git a/src/base/allocator/allocator_shim_default_dispatch_to_winheap.cc b/base/allocator/allocator_shim_default_dispatch_to_winheap.cc similarity index 100% rename from src/base/allocator/allocator_shim_default_dispatch_to_winheap.cc rename to base/allocator/allocator_shim_default_dispatch_to_winheap.cc
diff --git a/src/base/allocator/allocator_shim_internals.h b/base/allocator/allocator_shim_internals.h similarity index 100% rename from src/base/allocator/allocator_shim_internals.h rename to base/allocator/allocator_shim_internals.h
diff --git a/src/base/allocator/allocator_shim_override_cpp_symbols.h b/base/allocator/allocator_shim_override_cpp_symbols.h similarity index 100% rename from src/base/allocator/allocator_shim_override_cpp_symbols.h rename to base/allocator/allocator_shim_override_cpp_symbols.h
diff --git a/src/base/allocator/allocator_shim_override_glibc_weak_symbols.h b/base/allocator/allocator_shim_override_glibc_weak_symbols.h similarity index 100% rename from src/base/allocator/allocator_shim_override_glibc_weak_symbols.h rename to base/allocator/allocator_shim_override_glibc_weak_symbols.h
diff --git a/src/base/allocator/allocator_shim_override_libc_symbols.h b/base/allocator/allocator_shim_override_libc_symbols.h similarity index 100% rename from src/base/allocator/allocator_shim_override_libc_symbols.h rename to base/allocator/allocator_shim_override_libc_symbols.h
diff --git a/src/base/allocator/allocator_shim_override_linker_wrapped_symbols.h b/base/allocator/allocator_shim_override_linker_wrapped_symbols.h similarity index 100% rename from src/base/allocator/allocator_shim_override_linker_wrapped_symbols.h rename to base/allocator/allocator_shim_override_linker_wrapped_symbols.h
diff --git a/src/base/allocator/allocator_shim_override_mac_symbols.h b/base/allocator/allocator_shim_override_mac_symbols.h similarity index 100% rename from src/base/allocator/allocator_shim_override_mac_symbols.h rename to base/allocator/allocator_shim_override_mac_symbols.h
diff --git a/src/base/allocator/allocator_shim_override_ucrt_symbols_win.h b/base/allocator/allocator_shim_override_ucrt_symbols_win.h similarity index 100% rename from src/base/allocator/allocator_shim_override_ucrt_symbols_win.h rename to base/allocator/allocator_shim_override_ucrt_symbols_win.h
diff --git a/src/base/allocator/allocator_shim_unittest.cc b/base/allocator/allocator_shim_unittest.cc similarity index 100% rename from src/base/allocator/allocator_shim_unittest.cc rename to base/allocator/allocator_shim_unittest.cc
diff --git a/src/base/allocator/buildflags.h b/base/allocator/buildflags.h similarity index 100% rename from src/base/allocator/buildflags.h rename to base/allocator/buildflags.h
diff --git a/src/base/allocator/debugallocation_shim.cc b/base/allocator/debugallocation_shim.cc similarity index 100% rename from src/base/allocator/debugallocation_shim.cc rename to base/allocator/debugallocation_shim.cc
diff --git a/src/base/allocator/features.h b/base/allocator/features.h similarity index 100% rename from src/base/allocator/features.h rename to base/allocator/features.h
diff --git a/src/base/allocator/malloc_zone_functions_mac.cc b/base/allocator/malloc_zone_functions_mac.cc similarity index 100% rename from src/base/allocator/malloc_zone_functions_mac.cc rename to base/allocator/malloc_zone_functions_mac.cc
diff --git a/src/base/allocator/malloc_zone_functions_mac.h b/base/allocator/malloc_zone_functions_mac.h similarity index 100% rename from src/base/allocator/malloc_zone_functions_mac.h rename to base/allocator/malloc_zone_functions_mac.h
diff --git a/src/base/allocator/malloc_zone_functions_mac_unittest.cc b/base/allocator/malloc_zone_functions_mac_unittest.cc similarity index 100% rename from src/base/allocator/malloc_zone_functions_mac_unittest.cc rename to base/allocator/malloc_zone_functions_mac_unittest.cc
diff --git a/src/base/allocator/partition_allocator/PartitionAlloc.md b/base/allocator/partition_allocator/PartitionAlloc.md similarity index 100% rename from src/base/allocator/partition_allocator/PartitionAlloc.md rename to base/allocator/partition_allocator/PartitionAlloc.md
diff --git a/src/base/allocator/partition_allocator/address_space_randomization.cc b/base/allocator/partition_allocator/address_space_randomization.cc similarity index 100% rename from src/base/allocator/partition_allocator/address_space_randomization.cc rename to base/allocator/partition_allocator/address_space_randomization.cc
diff --git a/src/base/allocator/partition_allocator/address_space_randomization.h b/base/allocator/partition_allocator/address_space_randomization.h similarity index 100% rename from src/base/allocator/partition_allocator/address_space_randomization.h rename to base/allocator/partition_allocator/address_space_randomization.h
diff --git a/src/base/allocator/partition_allocator/address_space_randomization_unittest.cc b/base/allocator/partition_allocator/address_space_randomization_unittest.cc similarity index 100% rename from src/base/allocator/partition_allocator/address_space_randomization_unittest.cc rename to base/allocator/partition_allocator/address_space_randomization_unittest.cc
diff --git a/src/base/allocator/partition_allocator/oom.h b/base/allocator/partition_allocator/oom.h similarity index 100% rename from src/base/allocator/partition_allocator/oom.h rename to base/allocator/partition_allocator/oom.h
diff --git a/src/base/allocator/partition_allocator/oom_callback.cc b/base/allocator/partition_allocator/oom_callback.cc similarity index 100% rename from src/base/allocator/partition_allocator/oom_callback.cc rename to base/allocator/partition_allocator/oom_callback.cc
diff --git a/src/base/allocator/partition_allocator/oom_callback.h b/base/allocator/partition_allocator/oom_callback.h similarity index 100% rename from src/base/allocator/partition_allocator/oom_callback.h rename to base/allocator/partition_allocator/oom_callback.h
diff --git a/src/base/allocator/partition_allocator/page_allocator.cc b/base/allocator/partition_allocator/page_allocator.cc similarity index 100% rename from src/base/allocator/partition_allocator/page_allocator.cc rename to base/allocator/partition_allocator/page_allocator.cc
diff --git a/src/base/allocator/partition_allocator/page_allocator.h b/base/allocator/partition_allocator/page_allocator.h similarity index 100% rename from src/base/allocator/partition_allocator/page_allocator.h rename to base/allocator/partition_allocator/page_allocator.h
diff --git a/src/base/allocator/partition_allocator/page_allocator_constants.h b/base/allocator/partition_allocator/page_allocator_constants.h similarity index 100% rename from src/base/allocator/partition_allocator/page_allocator_constants.h rename to base/allocator/partition_allocator/page_allocator_constants.h
diff --git a/src/base/allocator/partition_allocator/page_allocator_internal.h b/base/allocator/partition_allocator/page_allocator_internal.h similarity index 100% rename from src/base/allocator/partition_allocator/page_allocator_internal.h rename to base/allocator/partition_allocator/page_allocator_internal.h
diff --git a/src/base/allocator/partition_allocator/page_allocator_internals_posix.h b/base/allocator/partition_allocator/page_allocator_internals_posix.h similarity index 100% rename from src/base/allocator/partition_allocator/page_allocator_internals_posix.h rename to base/allocator/partition_allocator/page_allocator_internals_posix.h
diff --git a/src/base/allocator/partition_allocator/page_allocator_internals_win.h b/base/allocator/partition_allocator/page_allocator_internals_win.h similarity index 100% rename from src/base/allocator/partition_allocator/page_allocator_internals_win.h rename to base/allocator/partition_allocator/page_allocator_internals_win.h
diff --git a/src/base/allocator/partition_allocator/page_allocator_unittest.cc b/base/allocator/partition_allocator/page_allocator_unittest.cc similarity index 100% rename from src/base/allocator/partition_allocator/page_allocator_unittest.cc rename to base/allocator/partition_allocator/page_allocator_unittest.cc
diff --git a/src/base/allocator/partition_allocator/partition_alloc.cc b/base/allocator/partition_allocator/partition_alloc.cc similarity index 100% rename from src/base/allocator/partition_allocator/partition_alloc.cc rename to base/allocator/partition_allocator/partition_alloc.cc
diff --git a/src/base/allocator/partition_allocator/partition_alloc.h b/base/allocator/partition_allocator/partition_alloc.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_alloc.h rename to base/allocator/partition_allocator/partition_alloc.h
diff --git a/src/base/allocator/partition_allocator/partition_alloc_constants.h b/base/allocator/partition_allocator/partition_alloc_constants.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_alloc_constants.h rename to base/allocator/partition_allocator/partition_alloc_constants.h
diff --git a/src/base/allocator/partition_allocator/partition_alloc_unittest.cc b/base/allocator/partition_allocator/partition_alloc_unittest.cc similarity index 100% rename from src/base/allocator/partition_allocator/partition_alloc_unittest.cc rename to base/allocator/partition_allocator/partition_alloc_unittest.cc
diff --git a/src/base/allocator/partition_allocator/partition_bucket.cc b/base/allocator/partition_allocator/partition_bucket.cc similarity index 100% rename from src/base/allocator/partition_allocator/partition_bucket.cc rename to base/allocator/partition_allocator/partition_bucket.cc
diff --git a/src/base/allocator/partition_allocator/partition_bucket.h b/base/allocator/partition_allocator/partition_bucket.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_bucket.h rename to base/allocator/partition_allocator/partition_bucket.h
diff --git a/src/base/allocator/partition_allocator/partition_cookie.h b/base/allocator/partition_allocator/partition_cookie.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_cookie.h rename to base/allocator/partition_allocator/partition_cookie.h
diff --git a/src/base/allocator/partition_allocator/partition_direct_map_extent.h b/base/allocator/partition_allocator/partition_direct_map_extent.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_direct_map_extent.h rename to base/allocator/partition_allocator/partition_direct_map_extent.h
diff --git a/src/base/allocator/partition_allocator/partition_freelist_entry.h b/base/allocator/partition_allocator/partition_freelist_entry.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_freelist_entry.h rename to base/allocator/partition_allocator/partition_freelist_entry.h
diff --git a/src/base/allocator/partition_allocator/partition_oom.cc b/base/allocator/partition_allocator/partition_oom.cc similarity index 100% rename from src/base/allocator/partition_allocator/partition_oom.cc rename to base/allocator/partition_allocator/partition_oom.cc
diff --git a/src/base/allocator/partition_allocator/partition_oom.h b/base/allocator/partition_allocator/partition_oom.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_oom.h rename to base/allocator/partition_allocator/partition_oom.h
diff --git a/src/base/allocator/partition_allocator/partition_page.cc b/base/allocator/partition_allocator/partition_page.cc similarity index 100% rename from src/base/allocator/partition_allocator/partition_page.cc rename to base/allocator/partition_allocator/partition_page.cc
diff --git a/src/base/allocator/partition_allocator/partition_page.h b/base/allocator/partition_allocator/partition_page.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_page.h rename to base/allocator/partition_allocator/partition_page.h
diff --git a/src/base/allocator/partition_allocator/partition_root_base.cc b/base/allocator/partition_allocator/partition_root_base.cc similarity index 100% rename from src/base/allocator/partition_allocator/partition_root_base.cc rename to base/allocator/partition_allocator/partition_root_base.cc
diff --git a/src/base/allocator/partition_allocator/partition_root_base.h b/base/allocator/partition_allocator/partition_root_base.h similarity index 100% rename from src/base/allocator/partition_allocator/partition_root_base.h rename to base/allocator/partition_allocator/partition_root_base.h
diff --git a/src/base/allocator/partition_allocator/spin_lock.cc b/base/allocator/partition_allocator/spin_lock.cc similarity index 100% rename from src/base/allocator/partition_allocator/spin_lock.cc rename to base/allocator/partition_allocator/spin_lock.cc
diff --git a/src/base/allocator/partition_allocator/spin_lock.h b/base/allocator/partition_allocator/spin_lock.h similarity index 100% rename from src/base/allocator/partition_allocator/spin_lock.h rename to base/allocator/partition_allocator/spin_lock.h
diff --git a/src/base/allocator/partition_allocator/spin_lock_unittest.cc b/base/allocator/partition_allocator/spin_lock_unittest.cc similarity index 100% rename from src/base/allocator/partition_allocator/spin_lock_unittest.cc rename to base/allocator/partition_allocator/spin_lock_unittest.cc
diff --git a/src/base/allocator/tcmalloc_unittest.cc b/base/allocator/tcmalloc_unittest.cc similarity index 100% rename from src/base/allocator/tcmalloc_unittest.cc rename to base/allocator/tcmalloc_unittest.cc
diff --git a/src/base/allocator/unittest_utils.cc b/base/allocator/unittest_utils.cc similarity index 100% rename from src/base/allocator/unittest_utils.cc rename to base/allocator/unittest_utils.cc
diff --git a/src/base/allocator/winheap_stubs_win.cc b/base/allocator/winheap_stubs_win.cc similarity index 100% rename from src/base/allocator/winheap_stubs_win.cc rename to base/allocator/winheap_stubs_win.cc
diff --git a/src/base/allocator/winheap_stubs_win.h b/base/allocator/winheap_stubs_win.h similarity index 100% rename from src/base/allocator/winheap_stubs_win.h rename to base/allocator/winheap_stubs_win.h
diff --git a/src/base/android/android_hardware_buffer_compat.cc b/base/android/android_hardware_buffer_compat.cc similarity index 100% rename from src/base/android/android_hardware_buffer_compat.cc rename to base/android/android_hardware_buffer_compat.cc
diff --git a/src/base/android/android_hardware_buffer_compat.h b/base/android/android_hardware_buffer_compat.h similarity index 100% rename from src/base/android/android_hardware_buffer_compat.h rename to base/android/android_hardware_buffer_compat.h
diff --git a/src/base/android/android_image_reader_abi.h b/base/android/android_image_reader_abi.h similarity index 100% rename from src/base/android/android_image_reader_abi.h rename to base/android/android_image_reader_abi.h
diff --git a/src/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc similarity index 100% rename from src/base/android/android_image_reader_compat.cc rename to base/android/android_image_reader_compat.cc
diff --git a/src/base/android/android_image_reader_compat.h b/base/android/android_image_reader_compat.h similarity index 100% rename from src/base/android/android_image_reader_compat.h rename to base/android/android_image_reader_compat.h
diff --git a/src/base/android/android_image_reader_compat_unittest.cc b/base/android/android_image_reader_compat_unittest.cc similarity index 100% rename from src/base/android/android_image_reader_compat_unittest.cc rename to base/android/android_image_reader_compat_unittest.cc
diff --git a/src/base/android/animation_frame_time_histogram.cc b/base/android/animation_frame_time_histogram.cc similarity index 100% rename from src/base/android/animation_frame_time_histogram.cc rename to base/android/animation_frame_time_histogram.cc
diff --git a/src/base/android/apk_assets.cc b/base/android/apk_assets.cc similarity index 100% rename from src/base/android/apk_assets.cc rename to base/android/apk_assets.cc
diff --git a/src/base/android/apk_assets.h b/base/android/apk_assets.h similarity index 100% rename from src/base/android/apk_assets.h rename to base/android/apk_assets.h
diff --git a/src/base/android/application_status_listener.cc b/base/android/application_status_listener.cc similarity index 100% rename from src/base/android/application_status_listener.cc rename to base/android/application_status_listener.cc
diff --git a/src/base/android/application_status_listener.h b/base/android/application_status_listener.h similarity index 100% rename from src/base/android/application_status_listener.h rename to base/android/application_status_listener.h
diff --git a/src/base/android/application_status_listener_unittest.cc b/base/android/application_status_listener_unittest.cc similarity index 100% rename from src/base/android/application_status_listener_unittest.cc rename to base/android/application_status_listener_unittest.cc
diff --git a/src/base/android/base_jni_onload.cc b/base/android/base_jni_onload.cc similarity index 100% rename from src/base/android/base_jni_onload.cc rename to base/android/base_jni_onload.cc
diff --git a/src/base/android/base_jni_onload.h b/base/android/base_jni_onload.h similarity index 100% rename from src/base/android/base_jni_onload.h rename to base/android/base_jni_onload.h
diff --git a/src/base/android/build_info.cc b/base/android/build_info.cc similarity index 100% rename from src/base/android/build_info.cc rename to base/android/build_info.cc
diff --git a/src/base/android/build_info.h b/base/android/build_info.h similarity index 100% rename from src/base/android/build_info.h rename to base/android/build_info.h
diff --git a/src/base/android/callback_android.cc b/base/android/callback_android.cc similarity index 100% rename from src/base/android/callback_android.cc rename to base/android/callback_android.cc
diff --git a/src/base/android/callback_android.h b/base/android/callback_android.h similarity index 100% rename from src/base/android/callback_android.h rename to base/android/callback_android.h
diff --git a/src/base/android/child_process_binding_types.h b/base/android/child_process_binding_types.h similarity index 100% rename from src/base/android/child_process_binding_types.h rename to base/android/child_process_binding_types.h
diff --git a/src/base/android/child_process_service.cc b/base/android/child_process_service.cc similarity index 100% rename from src/base/android/child_process_service.cc rename to base/android/child_process_service.cc
diff --git a/src/base/android/command_line_android.cc b/base/android/command_line_android.cc similarity index 100% rename from src/base/android/command_line_android.cc rename to base/android/command_line_android.cc
diff --git a/src/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc similarity index 100% rename from src/base/android/content_uri_utils.cc rename to base/android/content_uri_utils.cc
diff --git a/src/base/android/content_uri_utils.h b/base/android/content_uri_utils.h similarity index 100% rename from src/base/android/content_uri_utils.h rename to base/android/content_uri_utils.h
diff --git a/src/base/android/content_uri_utils_unittest.cc b/base/android/content_uri_utils_unittest.cc similarity index 100% rename from src/base/android/content_uri_utils_unittest.cc rename to base/android/content_uri_utils_unittest.cc
diff --git a/src/base/android/cpu_features.cc b/base/android/cpu_features.cc similarity index 100% rename from src/base/android/cpu_features.cc rename to base/android/cpu_features.cc
diff --git a/src/base/android/early_trace_event_binding.cc b/base/android/early_trace_event_binding.cc similarity index 100% rename from src/base/android/early_trace_event_binding.cc rename to base/android/early_trace_event_binding.cc
diff --git a/src/base/android/early_trace_event_binding.h b/base/android/early_trace_event_binding.h similarity index 100% rename from src/base/android/early_trace_event_binding.h rename to base/android/early_trace_event_binding.h
diff --git a/src/base/android/event_log.cc b/base/android/event_log.cc similarity index 100% rename from src/base/android/event_log.cc rename to base/android/event_log.cc
diff --git a/src/base/android/event_log.h b/base/android/event_log.h similarity index 100% rename from src/base/android/event_log.h rename to base/android/event_log.h
diff --git a/src/base/android/field_trial_list.cc b/base/android/field_trial_list.cc similarity index 100% rename from src/base/android/field_trial_list.cc rename to base/android/field_trial_list.cc
diff --git a/src/base/android/important_file_writer_android.cc b/base/android/important_file_writer_android.cc similarity index 100% rename from src/base/android/important_file_writer_android.cc rename to base/android/important_file_writer_android.cc
diff --git a/src/base/android/java/src/org/chromium/base/ActivityState.java b/base/android/java/src/org/chromium/base/ActivityState.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ActivityState.java rename to base/android/java/src/org/chromium/base/ActivityState.java
diff --git a/src/base/android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java b/base/android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java rename to base/android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java
diff --git a/src/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java rename to base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/ApkAssets.java b/base/android/java/src/org/chromium/base/ApkAssets.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ApkAssets.java rename to base/android/java/src/org/chromium/base/ApkAssets.java
diff --git a/src/base/android/java/src/org/chromium/base/ApplicationStatus.java b/base/android/java/src/org/chromium/base/ApplicationStatus.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ApplicationStatus.java rename to base/android/java/src/org/chromium/base/ApplicationStatus.java
diff --git a/src/base/android/java/src/org/chromium/base/BaseSwitches.java b/base/android/java/src/org/chromium/base/BaseSwitches.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/BaseSwitches.java rename to base/android/java/src/org/chromium/base/BaseSwitches.java
diff --git a/src/base/android/java/src/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/BuildInfo.java rename to base/android/java/src/org/chromium/base/BuildInfo.java
diff --git a/src/base/android/java/src/org/chromium/base/Callback.java b/base/android/java/src/org/chromium/base/Callback.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/Callback.java rename to base/android/java/src/org/chromium/base/Callback.java
diff --git a/src/base/android/java/src/org/chromium/base/CollectionUtil.java b/base/android/java/src/org/chromium/base/CollectionUtil.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/CollectionUtil.java rename to base/android/java/src/org/chromium/base/CollectionUtil.java
diff --git a/src/base/android/java/src/org/chromium/base/CommandLine.java b/base/android/java/src/org/chromium/base/CommandLine.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/CommandLine.java rename to base/android/java/src/org/chromium/base/CommandLine.java
diff --git a/src/base/android/java/src/org/chromium/base/CommandLineInitUtil.java b/base/android/java/src/org/chromium/base/CommandLineInitUtil.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/CommandLineInitUtil.java rename to base/android/java/src/org/chromium/base/CommandLineInitUtil.java
diff --git a/src/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base/android/java/src/org/chromium/base/ContentUriUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ContentUriUtils.java rename to base/android/java/src/org/chromium/base/ContentUriUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/ContextUtils.java b/base/android/java/src/org/chromium/base/ContextUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ContextUtils.java rename to base/android/java/src/org/chromium/base/ContextUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/CpuFeatures.java b/base/android/java/src/org/chromium/base/CpuFeatures.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/CpuFeatures.java rename to base/android/java/src/org/chromium/base/CpuFeatures.java
diff --git a/src/base/android/java/src/org/chromium/base/DiscardableReferencePool.java b/base/android/java/src/org/chromium/base/DiscardableReferencePool.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/DiscardableReferencePool.java rename to base/android/java/src/org/chromium/base/DiscardableReferencePool.java
diff --git a/src/base/android/java/src/org/chromium/base/EarlyTraceEvent.java b/base/android/java/src/org/chromium/base/EarlyTraceEvent.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/EarlyTraceEvent.java rename to base/android/java/src/org/chromium/base/EarlyTraceEvent.java
diff --git a/src/base/android/java/src/org/chromium/base/EventLog.java b/base/android/java/src/org/chromium/base/EventLog.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/EventLog.java rename to base/android/java/src/org/chromium/base/EventLog.java
diff --git a/src/base/android/java/src/org/chromium/base/FieldTrialList.java b/base/android/java/src/org/chromium/base/FieldTrialList.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/FieldTrialList.java rename to base/android/java/src/org/chromium/base/FieldTrialList.java
diff --git a/src/base/android/java/src/org/chromium/base/FileUtils.java b/base/android/java/src/org/chromium/base/FileUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/FileUtils.java rename to base/android/java/src/org/chromium/base/FileUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java b/base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java rename to base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java
diff --git a/src/base/android/java/src/org/chromium/base/JNIUtils.java b/base/android/java/src/org/chromium/base/JNIUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/JNIUtils.java rename to base/android/java/src/org/chromium/base/JNIUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/JavaExceptionReporter.java b/base/android/java/src/org/chromium/base/JavaExceptionReporter.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/JavaExceptionReporter.java rename to base/android/java/src/org/chromium/base/JavaExceptionReporter.java
diff --git a/src/base/android/java/src/org/chromium/base/JavaHandlerThread.java b/base/android/java/src/org/chromium/base/JavaHandlerThread.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/JavaHandlerThread.java rename to base/android/java/src/org/chromium/base/JavaHandlerThread.java
diff --git a/src/base/android/java/src/org/chromium/base/LocaleUtils.java b/base/android/java/src/org/chromium/base/LocaleUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/LocaleUtils.java rename to base/android/java/src/org/chromium/base/LocaleUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/Log.java b/base/android/java/src/org/chromium/base/Log.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/Log.java rename to base/android/java/src/org/chromium/base/Log.java
diff --git a/src/base/android/java/src/org/chromium/base/MemoryPressureListener.java b/base/android/java/src/org/chromium/base/MemoryPressureListener.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/MemoryPressureListener.java rename to base/android/java/src/org/chromium/base/MemoryPressureListener.java
diff --git a/src/base/android/java/src/org/chromium/base/NonThreadSafe.java b/base/android/java/src/org/chromium/base/NonThreadSafe.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/NonThreadSafe.java rename to base/android/java/src/org/chromium/base/NonThreadSafe.java
diff --git a/src/base/android/java/src/org/chromium/base/ObserverList.java b/base/android/java/src/org/chromium/base/ObserverList.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ObserverList.java rename to base/android/java/src/org/chromium/base/ObserverList.java
diff --git a/src/base/android/java/src/org/chromium/base/PackageUtils.java b/base/android/java/src/org/chromium/base/PackageUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/PackageUtils.java rename to base/android/java/src/org/chromium/base/PackageUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/PathService.java b/base/android/java/src/org/chromium/base/PathService.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/PathService.java rename to base/android/java/src/org/chromium/base/PathService.java
diff --git a/src/base/android/java/src/org/chromium/base/PathUtils.java b/base/android/java/src/org/chromium/base/PathUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/PathUtils.java rename to base/android/java/src/org/chromium/base/PathUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/PowerMonitor.java b/base/android/java/src/org/chromium/base/PowerMonitor.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/PowerMonitor.java rename to base/android/java/src/org/chromium/base/PowerMonitor.java
diff --git a/src/base/android/java/src/org/chromium/base/Promise.java b/base/android/java/src/org/chromium/base/Promise.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/Promise.java rename to base/android/java/src/org/chromium/base/Promise.java
diff --git a/src/base/android/java/src/org/chromium/base/SecureRandomInitializer.java b/base/android/java/src/org/chromium/base/SecureRandomInitializer.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/SecureRandomInitializer.java rename to base/android/java/src/org/chromium/base/SecureRandomInitializer.java
diff --git a/src/base/android/java/src/org/chromium/base/StreamUtil.java b/base/android/java/src/org/chromium/base/StreamUtil.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/StreamUtil.java rename to base/android/java/src/org/chromium/base/StreamUtil.java
diff --git a/src/base/android/java/src/org/chromium/base/StrictModeContext.java b/base/android/java/src/org/chromium/base/StrictModeContext.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/StrictModeContext.java rename to base/android/java/src/org/chromium/base/StrictModeContext.java
diff --git a/src/base/android/java/src/org/chromium/base/Supplier.java b/base/android/java/src/org/chromium/base/Supplier.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/Supplier.java rename to base/android/java/src/org/chromium/base/Supplier.java
diff --git a/src/base/android/java/src/org/chromium/base/SysUtils.java b/base/android/java/src/org/chromium/base/SysUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/SysUtils.java rename to base/android/java/src/org/chromium/base/SysUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/ThreadUtils.java b/base/android/java/src/org/chromium/base/ThreadUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/ThreadUtils.java rename to base/android/java/src/org/chromium/base/ThreadUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/TimeUtils.java b/base/android/java/src/org/chromium/base/TimeUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/TimeUtils.java rename to base/android/java/src/org/chromium/base/TimeUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/TimezoneUtils.java b/base/android/java/src/org/chromium/base/TimezoneUtils.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/TimezoneUtils.java rename to base/android/java/src/org/chromium/base/TimezoneUtils.java
diff --git a/src/base/android/java/src/org/chromium/base/TraceEvent.java b/base/android/java/src/org/chromium/base/TraceEvent.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/TraceEvent.java rename to base/android/java/src/org/chromium/base/TraceEvent.java
diff --git a/src/base/android/java/src/org/chromium/base/UnguessableToken.java b/base/android/java/src/org/chromium/base/UnguessableToken.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/UnguessableToken.java rename to base/android/java/src/org/chromium/base/UnguessableToken.java
diff --git a/src/base/android/java/src/org/chromium/base/UserData.java b/base/android/java/src/org/chromium/base/UserData.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/UserData.java rename to base/android/java/src/org/chromium/base/UserData.java
diff --git a/src/base/android/java/src/org/chromium/base/UserDataHost.java b/base/android/java/src/org/chromium/base/UserDataHost.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/UserDataHost.java rename to base/android/java/src/org/chromium/base/UserDataHost.java
diff --git a/src/base/android/java/src/org/chromium/base/VisibleForTesting.java b/base/android/java/src/org/chromium/base/VisibleForTesting.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/VisibleForTesting.java rename to base/android/java/src/org/chromium/base/VisibleForTesting.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/AccessedByNative.java b/base/android/java/src/org/chromium/base/annotations/AccessedByNative.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/AccessedByNative.java rename to base/android/java/src/org/chromium/base/annotations/AccessedByNative.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/CalledByNative.java b/base/android/java/src/org/chromium/base/annotations/CalledByNative.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/CalledByNative.java rename to base/android/java/src/org/chromium/base/annotations/CalledByNative.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java b/base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java rename to base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/DoNotInline.java b/base/android/java/src/org/chromium/base/annotations/DoNotInline.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/DoNotInline.java rename to base/android/java/src/org/chromium/base/annotations/DoNotInline.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java b/base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java rename to base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/JNINamespace.java b/base/android/java/src/org/chromium/base/annotations/JNINamespace.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/JNINamespace.java rename to base/android/java/src/org/chromium/base/annotations/JNINamespace.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/JniStaticNatives.java b/base/android/java/src/org/chromium/base/annotations/JniStaticNatives.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/JniStaticNatives.java rename to base/android/java/src/org/chromium/base/annotations/JniStaticNatives.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/MainDex.java b/base/android/java/src/org/chromium/base/annotations/MainDex.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/MainDex.java rename to base/android/java/src/org/chromium/base/annotations/MainDex.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/NativeCall.java b/base/android/java/src/org/chromium/base/annotations/NativeCall.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/NativeCall.java rename to base/android/java/src/org/chromium/base/annotations/NativeCall.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java b/base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java rename to base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/RemovableInRelease.java b/base/android/java/src/org/chromium/base/annotations/RemovableInRelease.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/RemovableInRelease.java rename to base/android/java/src/org/chromium/base/annotations/RemovableInRelease.java
diff --git a/src/base/android/java/src/org/chromium/base/annotations/UsedByReflection.java b/base/android/java/src/org/chromium/base/annotations/UsedByReflection.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/annotations/UsedByReflection.java rename to base/android/java/src/org/chromium/base/annotations/UsedByReflection.java
diff --git a/src/base/android/java/src/org/chromium/base/compat/ApiHelperForM.java b/base/android/java/src/org/chromium/base/compat/ApiHelperForM.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/compat/ApiHelperForM.java rename to base/android/java/src/org/chromium/base/compat/ApiHelperForM.java
diff --git a/src/base/android/java/src/org/chromium/base/compat/ApiHelperForN.java b/base/android/java/src/org/chromium/base/compat/ApiHelperForN.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/compat/ApiHelperForN.java rename to base/android/java/src/org/chromium/base/compat/ApiHelperForN.java
diff --git a/src/base/android/java/src/org/chromium/base/compat/ApiHelperForO.java b/base/android/java/src/org/chromium/base/compat/ApiHelperForO.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/compat/ApiHelperForO.java rename to base/android/java/src/org/chromium/base/compat/ApiHelperForO.java
diff --git a/src/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java rename to base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
diff --git a/src/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/library_loader/Linker.java rename to base/android/java/src/org/chromium/base/library_loader/Linker.java
diff --git a/src/base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java b/base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java rename to base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java
diff --git a/src/base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java b/base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java rename to base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java
diff --git a/src/base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java b/base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java rename to base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java
diff --git a/src/base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java b/base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java rename to base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java
diff --git a/src/base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java b/base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java rename to base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java
diff --git a/src/base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java b/base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java rename to base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java
diff --git a/src/base/android/java/src/org/chromium/base/metrics/CachedMetrics.java b/base/android/java/src/org/chromium/base/metrics/CachedMetrics.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/metrics/CachedMetrics.java rename to base/android/java/src/org/chromium/base/metrics/CachedMetrics.java
diff --git a/src/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java b/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java rename to base/android/java/src/org/chromium/base/metrics/RecordHistogram.java
diff --git a/src/base/android/java/src/org/chromium/base/metrics/RecordUserAction.java b/base/android/java/src/org/chromium/base/metrics/RecordUserAction.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/metrics/RecordUserAction.java rename to base/android/java/src/org/chromium/base/metrics/RecordUserAction.java
diff --git a/src/base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java b/base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java rename to base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java
diff --git a/src/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java b/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java rename to base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java b/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java rename to base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java rename to base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java rename to base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java rename to base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java rename to base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java rename to base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.aidl b/base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.aidl similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.aidl rename to base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.aidl
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java b/base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java rename to base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/ICallbackInt.aidl b/base/android/java/src/org/chromium/base/process_launcher/ICallbackInt.aidl similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/ICallbackInt.aidl rename to base/android/java/src/org/chromium/base/process_launcher/ICallbackInt.aidl
diff --git a/src/base/android/java/src/org/chromium/base/process_launcher/IChildProcessService.aidl b/base/android/java/src/org/chromium/base/process_launcher/IChildProcessService.aidl similarity index 100% rename from src/base/android/java/src/org/chromium/base/process_launcher/IChildProcessService.aidl rename to base/android/java/src/org/chromium/base/process_launcher/IChildProcessService.aidl
diff --git a/src/base/android/java/src/org/chromium/base/task/AsyncTask.java b/base/android/java/src/org/chromium/base/task/AsyncTask.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/task/AsyncTask.java rename to base/android/java/src/org/chromium/base/task/AsyncTask.java
diff --git a/src/base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java b/base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java rename to base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java
diff --git a/src/base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java b/base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java rename to base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java
diff --git a/src/base/android/java/src/org/chromium/base/task/SerialExecutor.java b/base/android/java/src/org/chromium/base/task/SerialExecutor.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/task/SerialExecutor.java rename to base/android/java/src/org/chromium/base/task/SerialExecutor.java
diff --git a/src/base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java b/base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java rename to base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java
diff --git a/src/base/android/java/src/org/chromium/base/task/TaskRunner.java b/base/android/java/src/org/chromium/base/task/TaskRunner.java similarity index 100% rename from src/base/android/java/src/org/chromium/base/task/TaskRunner.java rename to base/android/java/src/org/chromium/base/task/TaskRunner.java
diff --git a/src/base/android/java/templates/BuildConfig.template b/base/android/java/templates/BuildConfig.template similarity index 100% rename from src/base/android/java/templates/BuildConfig.template rename to base/android/java/templates/BuildConfig.template
diff --git a/src/base/android/java/templates/NativeLibraries.template b/base/android/java/templates/NativeLibraries.template similarity index 100% rename from src/base/android/java/templates/NativeLibraries.template rename to base/android/java/templates/NativeLibraries.template
diff --git a/src/base/android/java_exception_reporter.cc b/base/android/java_exception_reporter.cc similarity index 100% rename from src/base/android/java_exception_reporter.cc rename to base/android/java_exception_reporter.cc
diff --git a/src/base/android/java_exception_reporter.h b/base/android/java_exception_reporter.h similarity index 100% rename from src/base/android/java_exception_reporter.h rename to base/android/java_exception_reporter.h
diff --git a/src/base/android/java_handler_thread.cc b/base/android/java_handler_thread.cc similarity index 100% rename from src/base/android/java_handler_thread.cc rename to base/android/java_handler_thread.cc
diff --git a/src/base/android/java_handler_thread.h b/base/android/java_handler_thread.h similarity index 100% rename from src/base/android/java_handler_thread.h rename to base/android/java_handler_thread.h
diff --git a/src/base/android/java_runtime.cc b/base/android/java_runtime.cc similarity index 100% rename from src/base/android/java_runtime.cc rename to base/android/java_runtime.cc
diff --git a/src/base/android/java_runtime.h b/base/android/java_runtime.h similarity index 100% rename from src/base/android/java_runtime.h rename to base/android/java_runtime.h
diff --git a/src/base/android/javatests/src/org/chromium/base/AdvancedMockContextTest.java b/base/android/javatests/src/org/chromium/base/AdvancedMockContextTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/AdvancedMockContextTest.java rename to base/android/javatests/src/org/chromium/base/AdvancedMockContextTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/ApiCompatibilityUtilsTest.java b/base/android/javatests/src/org/chromium/base/ApiCompatibilityUtilsTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/ApiCompatibilityUtilsTest.java rename to base/android/javatests/src/org/chromium/base/ApiCompatibilityUtilsTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/AssertsTest.java b/base/android/javatests/src/org/chromium/base/AssertsTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/AssertsTest.java rename to base/android/javatests/src/org/chromium/base/AssertsTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java b/base/android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java rename to base/android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/CommandLineTest.java b/base/android/javatests/src/org/chromium/base/CommandLineTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/CommandLineTest.java rename to base/android/javatests/src/org/chromium/base/CommandLineTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java b/base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java rename to base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java b/base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java rename to base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/ObserverListTest.java b/base/android/javatests/src/org/chromium/base/ObserverListTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/ObserverListTest.java rename to base/android/javatests/src/org/chromium/base/ObserverListTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/StrictModeContextTest.java b/base/android/javatests/src/org/chromium/base/StrictModeContextTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/StrictModeContextTest.java rename to base/android/javatests/src/org/chromium/base/StrictModeContextTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/UserDataHostTest.java b/base/android/javatests/src/org/chromium/base/UserDataHostTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/UserDataHostTest.java rename to base/android/javatests/src/org/chromium/base/UserDataHostTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java b/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java rename to base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java
diff --git a/src/base/android/javatests/src/org/chromium/base/task/AsyncTaskTest.java b/base/android/javatests/src/org/chromium/base/task/AsyncTaskTest.java similarity index 100% rename from src/base/android/javatests/src/org/chromium/base/task/AsyncTaskTest.java rename to base/android/javatests/src/org/chromium/base/task/AsyncTaskTest.java
diff --git a/src/base/android/jni_android.cc b/base/android/jni_android.cc similarity index 100% rename from src/base/android/jni_android.cc rename to base/android/jni_android.cc
diff --git a/src/base/android/jni_android.h b/base/android/jni_android.h similarity index 100% rename from src/base/android/jni_android.h rename to base/android/jni_android.h
diff --git a/src/base/android/jni_android_unittest.cc b/base/android/jni_android_unittest.cc similarity index 100% rename from src/base/android/jni_android_unittest.cc rename to base/android/jni_android_unittest.cc
diff --git a/src/base/android/jni_array.cc b/base/android/jni_array.cc similarity index 100% rename from src/base/android/jni_array.cc rename to base/android/jni_array.cc
diff --git a/src/base/android/jni_array.h b/base/android/jni_array.h similarity index 100% rename from src/base/android/jni_array.h rename to base/android/jni_array.h
diff --git a/src/base/android/jni_array_unittest.cc b/base/android/jni_array_unittest.cc similarity index 100% rename from src/base/android/jni_array_unittest.cc rename to base/android/jni_array_unittest.cc
diff --git a/src/base/android/jni_generator/AndroidManifest.xml b/base/android/jni_generator/AndroidManifest.xml similarity index 100% rename from src/base/android/jni_generator/AndroidManifest.xml rename to base/android/jni_generator/AndroidManifest.xml
diff --git a/src/base/android/jni_generator/BUILD.gn b/base/android/jni_generator/BUILD.gn similarity index 100% rename from src/base/android/jni_generator/BUILD.gn rename to base/android/jni_generator/BUILD.gn
diff --git a/src/base/android/jni_generator/README.md b/base/android/jni_generator/README.md similarity index 100% rename from src/base/android/jni_generator/README.md rename to base/android/jni_generator/README.md
diff --git a/src/base/android/jni_generator/SampleForTests_jni.golden b/base/android/jni_generator/SampleForTests_jni.golden similarity index 100% rename from src/base/android/jni_generator/SampleForTests_jni.golden rename to base/android/jni_generator/SampleForTests_jni.golden
diff --git a/src/base/android/jni_generator/android_jar.classes b/base/android/jni_generator/android_jar.classes similarity index 100% rename from src/base/android/jni_generator/android_jar.classes rename to base/android/jni_generator/android_jar.classes
diff --git a/src/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForAnnotationProcessor.java b/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForAnnotationProcessor.java similarity index 100% rename from src/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForAnnotationProcessor.java rename to base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForAnnotationProcessor.java
diff --git a/src/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java b/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java similarity index 100% rename from src/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java rename to base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java
diff --git a/src/base/android/jni_generator/java/src/org/chromium/jni_generator/JniProcessor.java b/base/android/jni_generator/java/src/org/chromium/jni_generator/JniProcessor.java similarity index 100% rename from src/base/android/jni_generator/java/src/org/chromium/jni_generator/JniProcessor.java rename to base/android/jni_generator/java/src/org/chromium/jni_generator/JniProcessor.java
diff --git a/src/base/android/jni_generator/jni_exception_list.gni b/base/android/jni_generator/jni_exception_list.gni similarity index 100% rename from src/base/android/jni_generator/jni_exception_list.gni rename to base/android/jni_generator/jni_exception_list.gni
diff --git a/src/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py similarity index 100% rename from src/base/android/jni_generator/jni_generator.py rename to base/android/jni_generator/jni_generator.py
diff --git a/src/base/android/jni_generator/jni_generator.pydeps b/base/android/jni_generator/jni_generator.pydeps similarity index 100% rename from src/base/android/jni_generator/jni_generator.pydeps rename to base/android/jni_generator/jni_generator.pydeps
diff --git a/src/base/android/jni_generator/jni_generator_helper.h b/base/android/jni_generator/jni_generator_helper.h similarity index 100% rename from src/base/android/jni_generator/jni_generator_helper.h rename to base/android/jni_generator/jni_generator_helper.h
diff --git a/src/base/android/jni_generator/jni_generator_tests.py b/base/android/jni_generator/jni_generator_tests.py similarity index 100% rename from src/base/android/jni_generator/jni_generator_tests.py rename to base/android/jni_generator/jni_generator_tests.py
diff --git a/src/base/android/jni_generator/jni_registration_generator.py b/base/android/jni_generator/jni_registration_generator.py similarity index 100% rename from src/base/android/jni_generator/jni_registration_generator.py rename to base/android/jni_generator/jni_registration_generator.py
diff --git a/src/base/android/jni_generator/jni_registration_generator.pydeps b/base/android/jni_generator/jni_registration_generator.pydeps similarity index 100% rename from src/base/android/jni_generator/jni_registration_generator.pydeps rename to base/android/jni_generator/jni_registration_generator.pydeps
diff --git a/src/base/android/jni_generator/sample_entry_point.cc b/base/android/jni_generator/sample_entry_point.cc similarity index 100% rename from src/base/android/jni_generator/sample_entry_point.cc rename to base/android/jni_generator/sample_entry_point.cc
diff --git a/src/base/android/jni_generator/sample_for_tests.cc b/base/android/jni_generator/sample_for_tests.cc similarity index 100% rename from src/base/android/jni_generator/sample_for_tests.cc rename to base/android/jni_generator/sample_for_tests.cc
diff --git a/src/base/android/jni_generator/sample_for_tests.h b/base/android/jni_generator/sample_for_tests.h similarity index 100% rename from src/base/android/jni_generator/sample_for_tests.h rename to base/android/jni_generator/sample_for_tests.h
diff --git a/src/base/android/jni_generator/testCalledByNatives.golden b/base/android/jni_generator/testCalledByNatives.golden similarity index 100% rename from src/base/android/jni_generator/testCalledByNatives.golden rename to base/android/jni_generator/testCalledByNatives.golden
diff --git a/src/base/android/jni_generator/testConstantsFromJavaP.golden b/base/android/jni_generator/testConstantsFromJavaP.golden similarity index 100% rename from src/base/android/jni_generator/testConstantsFromJavaP.golden rename to base/android/jni_generator/testConstantsFromJavaP.golden
diff --git a/src/base/android/jni_generator/testFromJavaP.golden b/base/android/jni_generator/testFromJavaP.golden similarity index 100% rename from src/base/android/jni_generator/testFromJavaP.golden rename to base/android/jni_generator/testFromJavaP.golden
diff --git a/src/base/android/jni_generator/testFromJavaPGenerics.golden b/base/android/jni_generator/testFromJavaPGenerics.golden similarity index 100% rename from src/base/android/jni_generator/testFromJavaPGenerics.golden rename to base/android/jni_generator/testFromJavaPGenerics.golden
diff --git a/src/base/android/jni_generator/testInnerClassNatives.golden b/base/android/jni_generator/testInnerClassNatives.golden similarity index 100% rename from src/base/android/jni_generator/testInnerClassNatives.golden rename to base/android/jni_generator/testInnerClassNatives.golden
diff --git a/src/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden b/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden similarity index 100% rename from src/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden rename to base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden
diff --git a/src/base/android/jni_generator/testInnerClassNativesBothInnerAndOuterRegistrations.golden b/base/android/jni_generator/testInnerClassNativesBothInnerAndOuterRegistrations.golden similarity index 100% rename from src/base/android/jni_generator/testInnerClassNativesBothInnerAndOuterRegistrations.golden rename to base/android/jni_generator/testInnerClassNativesBothInnerAndOuterRegistrations.golden
diff --git a/src/base/android/jni_generator/testInnerClassNativesMultiple.golden b/base/android/jni_generator/testInnerClassNativesMultiple.golden similarity index 100% rename from src/base/android/jni_generator/testInnerClassNativesMultiple.golden rename to base/android/jni_generator/testInnerClassNativesMultiple.golden
diff --git a/src/base/android/jni_generator/testInputStream.javap b/base/android/jni_generator/testInputStream.javap similarity index 100% rename from src/base/android/jni_generator/testInputStream.javap rename to base/android/jni_generator/testInputStream.javap
diff --git a/src/base/android/jni_generator/testMotionEvent.javap b/base/android/jni_generator/testMotionEvent.javap similarity index 100% rename from src/base/android/jni_generator/testMotionEvent.javap rename to base/android/jni_generator/testMotionEvent.javap
diff --git a/src/base/android/jni_generator/testMotionEvent.javap7 b/base/android/jni_generator/testMotionEvent.javap7 similarity index 100% rename from src/base/android/jni_generator/testMotionEvent.javap7 rename to base/android/jni_generator/testMotionEvent.javap7
diff --git a/src/base/android/jni_generator/testMultipleJNIAdditionalImport.golden b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden similarity index 100% rename from src/base/android/jni_generator/testMultipleJNIAdditionalImport.golden rename to base/android/jni_generator/testMultipleJNIAdditionalImport.golden
diff --git a/src/base/android/jni_generator/testNativeExportsOnlyOption.golden b/base/android/jni_generator/testNativeExportsOnlyOption.golden similarity index 100% rename from src/base/android/jni_generator/testNativeExportsOnlyOption.golden rename to base/android/jni_generator/testNativeExportsOnlyOption.golden
diff --git a/src/base/android/jni_generator/testNatives.golden b/base/android/jni_generator/testNatives.golden similarity index 100% rename from src/base/android/jni_generator/testNatives.golden rename to base/android/jni_generator/testNatives.golden
diff --git a/src/base/android/jni_generator/testNativesLong.golden b/base/android/jni_generator/testNativesLong.golden similarity index 100% rename from src/base/android/jni_generator/testNativesLong.golden rename to base/android/jni_generator/testNativesLong.golden
diff --git a/src/base/android/jni_generator/testNativesRegistrations.golden b/base/android/jni_generator/testNativesRegistrations.golden similarity index 100% rename from src/base/android/jni_generator/testNativesRegistrations.golden rename to base/android/jni_generator/testNativesRegistrations.golden
diff --git a/src/base/android/jni_generator/testSingleJNIAdditionalImport.golden b/base/android/jni_generator/testSingleJNIAdditionalImport.golden similarity index 100% rename from src/base/android/jni_generator/testSingleJNIAdditionalImport.golden rename to base/android/jni_generator/testSingleJNIAdditionalImport.golden
diff --git a/src/base/android/jni_generator/testTracing.golden b/base/android/jni_generator/testTracing.golden similarity index 100% rename from src/base/android/jni_generator/testTracing.golden rename to base/android/jni_generator/testTracing.golden
diff --git a/src/base/android/jni_int_wrapper.h b/base/android/jni_int_wrapper.h similarity index 100% rename from src/base/android/jni_int_wrapper.h rename to base/android/jni_int_wrapper.h
diff --git a/src/base/android/jni_registrar.cc b/base/android/jni_registrar.cc similarity index 100% rename from src/base/android/jni_registrar.cc rename to base/android/jni_registrar.cc
diff --git a/src/base/android/jni_registrar.h b/base/android/jni_registrar.h similarity index 100% rename from src/base/android/jni_registrar.h rename to base/android/jni_registrar.h
diff --git a/src/base/android/jni_string.cc b/base/android/jni_string.cc similarity index 100% rename from src/base/android/jni_string.cc rename to base/android/jni_string.cc
diff --git a/src/base/android/jni_string.h b/base/android/jni_string.h similarity index 100% rename from src/base/android/jni_string.h rename to base/android/jni_string.h
diff --git a/src/base/android/jni_string_unittest.cc b/base/android/jni_string_unittest.cc similarity index 100% rename from src/base/android/jni_string_unittest.cc rename to base/android/jni_string_unittest.cc
diff --git a/src/base/android/jni_utils.cc b/base/android/jni_utils.cc similarity index 100% rename from src/base/android/jni_utils.cc rename to base/android/jni_utils.cc
diff --git a/src/base/android/jni_utils.h b/base/android/jni_utils.h similarity index 100% rename from src/base/android/jni_utils.h rename to base/android/jni_utils.h
diff --git a/src/base/android/jni_weak_ref.cc b/base/android/jni_weak_ref.cc similarity index 100% rename from src/base/android/jni_weak_ref.cc rename to base/android/jni_weak_ref.cc
diff --git a/src/base/android/jni_weak_ref.h b/base/android/jni_weak_ref.h similarity index 100% rename from src/base/android/jni_weak_ref.h rename to base/android/jni_weak_ref.h
diff --git a/src/base/android/junit/src/org/chromium/base/ApplicationStatusTest.java b/base/android/junit/src/org/chromium/base/ApplicationStatusTest.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/ApplicationStatusTest.java rename to base/android/junit/src/org/chromium/base/ApplicationStatusTest.java
diff --git a/src/base/android/junit/src/org/chromium/base/DiscardableReferencePoolTest.java b/base/android/junit/src/org/chromium/base/DiscardableReferencePoolTest.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/DiscardableReferencePoolTest.java rename to base/android/junit/src/org/chromium/base/DiscardableReferencePoolTest.java
diff --git a/src/base/android/junit/src/org/chromium/base/LogTest.java b/base/android/junit/src/org/chromium/base/LogTest.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/LogTest.java rename to base/android/junit/src/org/chromium/base/LogTest.java
diff --git a/src/base/android/junit/src/org/chromium/base/NonThreadSafeTest.java b/base/android/junit/src/org/chromium/base/NonThreadSafeTest.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/NonThreadSafeTest.java rename to base/android/junit/src/org/chromium/base/NonThreadSafeTest.java
diff --git a/src/base/android/junit/src/org/chromium/base/PromiseTest.java b/base/android/junit/src/org/chromium/base/PromiseTest.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/PromiseTest.java rename to base/android/junit/src/org/chromium/base/PromiseTest.java
diff --git a/src/base/android/junit/src/org/chromium/base/memory/MemoryPressureMonitorTest.java b/base/android/junit/src/org/chromium/base/memory/MemoryPressureMonitorTest.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/memory/MemoryPressureMonitorTest.java rename to base/android/junit/src/org/chromium/base/memory/MemoryPressureMonitorTest.java
diff --git a/src/base/android/junit/src/org/chromium/base/metrics/test/ShadowRecordHistogram.java b/base/android/junit/src/org/chromium/base/metrics/test/ShadowRecordHistogram.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/metrics/test/ShadowRecordHistogram.java rename to base/android/junit/src/org/chromium/base/metrics/test/ShadowRecordHistogram.java
diff --git a/src/base/android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java b/base/android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java rename to base/android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java
diff --git a/src/base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java b/base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java similarity index 100% rename from src/base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java rename to base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java
diff --git a/src/base/android/library_loader/README.md b/base/android/library_loader/README.md similarity index 100% rename from src/base/android/library_loader/README.md rename to base/android/library_loader/README.md
diff --git a/src/base/android/library_loader/anchor_functions.cc b/base/android/library_loader/anchor_functions.cc similarity index 100% rename from src/base/android/library_loader/anchor_functions.cc rename to base/android/library_loader/anchor_functions.cc
diff --git a/src/base/android/library_loader/anchor_functions.h b/base/android/library_loader/anchor_functions.h similarity index 100% rename from src/base/android/library_loader/anchor_functions.h rename to base/android/library_loader/anchor_functions.h
diff --git a/src/base/android/library_loader/anchor_functions.lds b/base/android/library_loader/anchor_functions.lds similarity index 100% rename from src/base/android/library_loader/anchor_functions.lds rename to base/android/library_loader/anchor_functions.lds
diff --git a/src/base/android/library_loader/library_load_from_apk_status_codes.h b/base/android/library_loader/library_load_from_apk_status_codes.h similarity index 100% rename from src/base/android/library_loader/library_load_from_apk_status_codes.h rename to base/android/library_loader/library_load_from_apk_status_codes.h
diff --git a/src/base/android/library_loader/library_loader_hooks.cc b/base/android/library_loader/library_loader_hooks.cc similarity index 100% rename from src/base/android/library_loader/library_loader_hooks.cc rename to base/android/library_loader/library_loader_hooks.cc
diff --git a/src/base/android/library_loader/library_loader_hooks.h b/base/android/library_loader/library_loader_hooks.h similarity index 100% rename from src/base/android/library_loader/library_loader_hooks.h rename to base/android/library_loader/library_loader_hooks.h
diff --git a/src/base/android/library_loader/library_prefetcher.cc b/base/android/library_loader/library_prefetcher.cc similarity index 100% rename from src/base/android/library_loader/library_prefetcher.cc rename to base/android/library_loader/library_prefetcher.cc
diff --git a/src/base/android/library_loader/library_prefetcher.h b/base/android/library_loader/library_prefetcher.h similarity index 100% rename from src/base/android/library_loader/library_prefetcher.h rename to base/android/library_loader/library_prefetcher.h
diff --git a/src/base/android/library_loader/library_prefetcher_unittest.cc b/base/android/library_loader/library_prefetcher_unittest.cc similarity index 100% rename from src/base/android/library_loader/library_prefetcher_unittest.cc rename to base/android/library_loader/library_prefetcher_unittest.cc
diff --git a/src/base/android/linker/BUILD.gn b/base/android/linker/BUILD.gn similarity index 100% rename from src/base/android/linker/BUILD.gn rename to base/android/linker/BUILD.gn
diff --git a/src/base/android/linker/config.gni b/base/android/linker/config.gni similarity index 100% rename from src/base/android/linker/config.gni rename to base/android/linker/config.gni
diff --git a/src/base/android/linker/linker_jni.cc b/base/android/linker/linker_jni.cc similarity index 100% rename from src/base/android/linker/linker_jni.cc rename to base/android/linker/linker_jni.cc
diff --git a/src/base/android/locale_utils.cc b/base/android/locale_utils.cc similarity index 100% rename from src/base/android/locale_utils.cc rename to base/android/locale_utils.cc
diff --git a/src/base/android/locale_utils.h b/base/android/locale_utils.h similarity index 100% rename from src/base/android/locale_utils.h rename to base/android/locale_utils.h
diff --git a/src/base/android/memory_pressure_listener_android.cc b/base/android/memory_pressure_listener_android.cc similarity index 100% rename from src/base/android/memory_pressure_listener_android.cc rename to base/android/memory_pressure_listener_android.cc
diff --git a/src/base/android/memory_pressure_listener_android.h b/base/android/memory_pressure_listener_android.h similarity index 100% rename from src/base/android/memory_pressure_listener_android.h rename to base/android/memory_pressure_listener_android.h
diff --git a/src/base/android/orderfile/BUILD.gn b/base/android/orderfile/BUILD.gn similarity index 100% rename from src/base/android/orderfile/BUILD.gn rename to base/android/orderfile/BUILD.gn
diff --git a/src/base/android/orderfile/orderfile_instrumentation.cc b/base/android/orderfile/orderfile_instrumentation.cc similarity index 100% rename from src/base/android/orderfile/orderfile_instrumentation.cc rename to base/android/orderfile/orderfile_instrumentation.cc
diff --git a/src/base/android/orderfile/orderfile_instrumentation.h b/base/android/orderfile/orderfile_instrumentation.h similarity index 100% rename from src/base/android/orderfile/orderfile_instrumentation.h rename to base/android/orderfile/orderfile_instrumentation.h
diff --git a/src/base/android/orderfile/orderfile_instrumentation_perftest.cc b/base/android/orderfile/orderfile_instrumentation_perftest.cc similarity index 100% rename from src/base/android/orderfile/orderfile_instrumentation_perftest.cc rename to base/android/orderfile/orderfile_instrumentation_perftest.cc
diff --git a/src/base/android/path_service_android.cc b/base/android/path_service_android.cc similarity index 100% rename from src/base/android/path_service_android.cc rename to base/android/path_service_android.cc
diff --git a/src/base/android/path_utils.cc b/base/android/path_utils.cc similarity index 100% rename from src/base/android/path_utils.cc rename to base/android/path_utils.cc
diff --git a/src/base/android/path_utils.h b/base/android/path_utils.h similarity index 100% rename from src/base/android/path_utils.h rename to base/android/path_utils.h
diff --git a/src/base/android/path_utils_unittest.cc b/base/android/path_utils_unittest.cc similarity index 100% rename from src/base/android/path_utils_unittest.cc rename to base/android/path_utils_unittest.cc
diff --git a/src/base/android/proguard/chromium_apk.flags b/base/android/proguard/chromium_apk.flags similarity index 100% rename from src/base/android/proguard/chromium_apk.flags rename to base/android/proguard/chromium_apk.flags
diff --git a/src/base/android/proguard/chromium_code.flags b/base/android/proguard/chromium_code.flags similarity index 100% rename from src/base/android/proguard/chromium_code.flags rename to base/android/proguard/chromium_code.flags
diff --git a/src/base/android/proguard/disable_all_obfuscation.flags b/base/android/proguard/disable_all_obfuscation.flags similarity index 100% rename from src/base/android/proguard/disable_all_obfuscation.flags rename to base/android/proguard/disable_all_obfuscation.flags
diff --git a/src/base/android/proguard/disable_chromium_obfuscation.flags b/base/android/proguard/disable_chromium_obfuscation.flags similarity index 100% rename from src/base/android/proguard/disable_chromium_obfuscation.flags rename to base/android/proguard/disable_chromium_obfuscation.flags
diff --git a/src/base/android/proguard/enable_obfuscation.flags b/base/android/proguard/enable_obfuscation.flags similarity index 100% rename from src/base/android/proguard/enable_obfuscation.flags rename to base/android/proguard/enable_obfuscation.flags
diff --git a/src/base/android/proguard/proguard.gni b/base/android/proguard/proguard.gni similarity index 100% rename from src/base/android/proguard/proguard.gni rename to base/android/proguard/proguard.gni
diff --git a/src/base/android/record_histogram.cc b/base/android/record_histogram.cc similarity index 100% rename from src/base/android/record_histogram.cc rename to base/android/record_histogram.cc
diff --git a/src/base/android/record_user_action.cc b/base/android/record_user_action.cc similarity index 100% rename from src/base/android/record_user_action.cc rename to base/android/record_user_action.cc
diff --git a/src/base/android/scoped_hardware_buffer_handle.cc b/base/android/scoped_hardware_buffer_handle.cc similarity index 100% rename from src/base/android/scoped_hardware_buffer_handle.cc rename to base/android/scoped_hardware_buffer_handle.cc
diff --git a/src/base/android/scoped_hardware_buffer_handle.h b/base/android/scoped_hardware_buffer_handle.h similarity index 100% rename from src/base/android/scoped_hardware_buffer_handle.h rename to base/android/scoped_hardware_buffer_handle.h
diff --git a/src/base/android/scoped_java_ref.cc b/base/android/scoped_java_ref.cc similarity index 100% rename from src/base/android/scoped_java_ref.cc rename to base/android/scoped_java_ref.cc
diff --git a/src/base/android/scoped_java_ref.h b/base/android/scoped_java_ref.h similarity index 100% rename from src/base/android/scoped_java_ref.h rename to base/android/scoped_java_ref.h
diff --git a/src/base/android/scoped_java_ref_unittest.cc b/base/android/scoped_java_ref_unittest.cc similarity index 100% rename from src/base/android/scoped_java_ref_unittest.cc rename to base/android/scoped_java_ref_unittest.cc
diff --git a/src/base/android/statistics_recorder_android.cc b/base/android/statistics_recorder_android.cc similarity index 100% rename from src/base/android/statistics_recorder_android.cc rename to base/android/statistics_recorder_android.cc
diff --git a/src/base/android/sys_utils.cc b/base/android/sys_utils.cc similarity index 100% rename from src/base/android/sys_utils.cc rename to base/android/sys_utils.cc
diff --git a/src/base/android/sys_utils.h b/base/android/sys_utils.h similarity index 100% rename from src/base/android/sys_utils.h rename to base/android/sys_utils.h
diff --git a/src/base/android/sys_utils_unittest.cc b/base/android/sys_utils_unittest.cc similarity index 100% rename from src/base/android/sys_utils_unittest.cc rename to base/android/sys_utils_unittest.cc
diff --git a/src/base/android/time_utils.cc b/base/android/time_utils.cc similarity index 100% rename from src/base/android/time_utils.cc rename to base/android/time_utils.cc
diff --git a/src/base/android/timezone_utils.cc b/base/android/timezone_utils.cc similarity index 100% rename from src/base/android/timezone_utils.cc rename to base/android/timezone_utils.cc
diff --git a/src/base/android/timezone_utils.h b/base/android/timezone_utils.h similarity index 100% rename from src/base/android/timezone_utils.h rename to base/android/timezone_utils.h
diff --git a/src/base/android/trace_event_binding.cc b/base/android/trace_event_binding.cc similarity index 100% rename from src/base/android/trace_event_binding.cc rename to base/android/trace_event_binding.cc
diff --git a/src/base/android/unguessable_token_android.cc b/base/android/unguessable_token_android.cc similarity index 100% rename from src/base/android/unguessable_token_android.cc rename to base/android/unguessable_token_android.cc
diff --git a/src/base/android/unguessable_token_android.h b/base/android/unguessable_token_android.h similarity index 100% rename from src/base/android/unguessable_token_android.h rename to base/android/unguessable_token_android.h
diff --git a/src/base/android/unguessable_token_android_unittest.cc b/base/android/unguessable_token_android_unittest.cc similarity index 100% rename from src/base/android/unguessable_token_android_unittest.cc rename to base/android/unguessable_token_android_unittest.cc
diff --git a/src/base/at_exit.cc b/base/at_exit.cc similarity index 100% rename from src/base/at_exit.cc rename to base/at_exit.cc
diff --git a/src/base/at_exit.h b/base/at_exit.h similarity index 100% rename from src/base/at_exit.h rename to base/at_exit.h
diff --git a/src/base/at_exit_unittest.cc b/base/at_exit_unittest.cc similarity index 100% rename from src/base/at_exit_unittest.cc rename to base/at_exit_unittest.cc
diff --git a/src/base/atomic_ref_count.h b/base/atomic_ref_count.h similarity index 100% rename from src/base/atomic_ref_count.h rename to base/atomic_ref_count.h
diff --git a/src/base/atomic_sequence_num.h b/base/atomic_sequence_num.h similarity index 100% rename from src/base/atomic_sequence_num.h rename to base/atomic_sequence_num.h
diff --git a/src/base/atomicops.h b/base/atomicops.h similarity index 100% rename from src/base/atomicops.h rename to base/atomicops.h
diff --git a/src/base/atomicops_internals_atomicword_compat.h b/base/atomicops_internals_atomicword_compat.h similarity index 100% rename from src/base/atomicops_internals_atomicword_compat.h rename to base/atomicops_internals_atomicword_compat.h
diff --git a/src/base/atomicops_internals_portable.h b/base/atomicops_internals_portable.h similarity index 100% rename from src/base/atomicops_internals_portable.h rename to base/atomicops_internals_portable.h
diff --git a/src/base/atomicops_internals_starboard.h b/base/atomicops_internals_starboard.h similarity index 100% rename from src/base/atomicops_internals_starboard.h rename to base/atomicops_internals_starboard.h
diff --git a/src/base/atomicops_internals_x86_msvc.h b/base/atomicops_internals_x86_msvc.h similarity index 100% rename from src/base/atomicops_internals_x86_msvc.h rename to base/atomicops_internals_x86_msvc.h
diff --git a/src/base/atomicops_unittest.cc b/base/atomicops_unittest.cc similarity index 100% rename from src/base/atomicops_unittest.cc rename to base/atomicops_unittest.cc
diff --git a/src/base/auto_reset.h b/base/auto_reset.h similarity index 100% rename from src/base/auto_reset.h rename to base/auto_reset.h
diff --git a/src/base/barrier_closure.cc b/base/barrier_closure.cc similarity index 100% rename from src/base/barrier_closure.cc rename to base/barrier_closure.cc
diff --git a/src/base/barrier_closure.h b/base/barrier_closure.h similarity index 100% rename from src/base/barrier_closure.h rename to base/barrier_closure.h
diff --git a/src/base/barrier_closure_unittest.cc b/base/barrier_closure_unittest.cc similarity index 100% rename from src/base/barrier_closure_unittest.cc rename to base/barrier_closure_unittest.cc
diff --git a/src/base/base.gyp b/base/base.gyp similarity index 100% rename from src/base/base.gyp rename to base/base.gyp
diff --git a/src/base/base64.cc b/base/base64.cc similarity index 100% rename from src/base/base64.cc rename to base/base64.cc
diff --git a/src/base/base64.h b/base/base64.h similarity index 100% rename from src/base/base64.h rename to base/base64.h
diff --git a/src/base/base64_decode_fuzzer.cc b/base/base64_decode_fuzzer.cc similarity index 100% rename from src/base/base64_decode_fuzzer.cc rename to base/base64_decode_fuzzer.cc
diff --git a/src/base/base64_encode_fuzzer.cc b/base/base64_encode_fuzzer.cc similarity index 100% rename from src/base/base64_encode_fuzzer.cc rename to base/base64_encode_fuzzer.cc
diff --git a/src/base/base64_unittest.cc b/base/base64_unittest.cc similarity index 100% rename from src/base/base64_unittest.cc rename to base/base64_unittest.cc
diff --git a/src/base/base64url.cc b/base/base64url.cc similarity index 100% rename from src/base/base64url.cc rename to base/base64url.cc
diff --git a/src/base/base64url.h b/base/base64url.h similarity index 100% rename from src/base/base64url.h rename to base/base64url.h
diff --git a/src/base/base64url_unittest.cc b/base/base64url_unittest.cc similarity index 100% rename from src/base/base64url_unittest.cc rename to base/base64url_unittest.cc
diff --git a/src/base/base_export.h b/base/base_export.h similarity index 100% rename from src/base/base_export.h rename to base/base_export.h
diff --git a/src/base/base_paths.cc b/base/base_paths.cc similarity index 100% rename from src/base/base_paths.cc rename to base/base_paths.cc
diff --git a/src/base/base_paths.h b/base/base_paths.h similarity index 100% rename from src/base/base_paths.h rename to base/base_paths.h
diff --git a/src/base/base_paths_android.cc b/base/base_paths_android.cc similarity index 100% rename from src/base/base_paths_android.cc rename to base/base_paths_android.cc
diff --git a/src/base/base_paths_android.h b/base/base_paths_android.h similarity index 100% rename from src/base/base_paths_android.h rename to base/base_paths_android.h
diff --git a/src/base/base_paths_fuchsia.cc b/base/base_paths_fuchsia.cc similarity index 100% rename from src/base/base_paths_fuchsia.cc rename to base/base_paths_fuchsia.cc
diff --git a/src/base/base_paths_fuchsia.h b/base/base_paths_fuchsia.h similarity index 100% rename from src/base/base_paths_fuchsia.h rename to base/base_paths_fuchsia.h
diff --git a/src/base/base_paths_mac.h b/base/base_paths_mac.h similarity index 100% rename from src/base/base_paths_mac.h rename to base/base_paths_mac.h
diff --git a/src/base/base_paths_mac.mm b/base/base_paths_mac.mm similarity index 100% rename from src/base/base_paths_mac.mm rename to base/base_paths_mac.mm
diff --git a/src/base/base_paths_posix.cc b/base/base_paths_posix.cc similarity index 100% rename from src/base/base_paths_posix.cc rename to base/base_paths_posix.cc
diff --git a/src/base/base_paths_posix.h b/base/base_paths_posix.h similarity index 100% rename from src/base/base_paths_posix.h rename to base/base_paths_posix.h
diff --git a/src/base/base_paths_starboard.cc b/base/base_paths_starboard.cc similarity index 100% rename from src/base/base_paths_starboard.cc rename to base/base_paths_starboard.cc
diff --git a/src/base/base_paths_starboard.h b/base/base_paths_starboard.h similarity index 100% rename from src/base/base_paths_starboard.h rename to base/base_paths_starboard.h
diff --git a/src/base/base_paths_win.cc b/base/base_paths_win.cc similarity index 100% rename from src/base/base_paths_win.cc rename to base/base_paths_win.cc
diff --git a/src/base/base_paths_win.h b/base/base_paths_win.h similarity index 100% rename from src/base/base_paths_win.h rename to base/base_paths_win.h
diff --git a/src/base/base_switches.cc b/base/base_switches.cc similarity index 100% rename from src/base/base_switches.cc rename to base/base_switches.cc
diff --git a/src/base/base_switches.h b/base/base_switches.h similarity index 100% rename from src/base/base_switches.h rename to base/base_switches.h
diff --git a/src/base/basictypes.h b/base/basictypes.h similarity index 100% rename from src/base/basictypes.h rename to base/basictypes.h
diff --git a/src/base/big_endian.cc b/base/big_endian.cc similarity index 100% rename from src/base/big_endian.cc rename to base/big_endian.cc
diff --git a/src/base/big_endian.h b/base/big_endian.h similarity index 100% rename from src/base/big_endian.h rename to base/big_endian.h
diff --git a/src/base/big_endian_unittest.cc b/base/big_endian_unittest.cc similarity index 100% rename from src/base/big_endian_unittest.cc rename to base/big_endian_unittest.cc
diff --git a/src/base/bind.h b/base/bind.h similarity index 100% rename from src/base/bind.h rename to base/bind.h
diff --git a/src/base/bind_helpers.h b/base/bind_helpers.h similarity index 100% rename from src/base/bind_helpers.h rename to base/bind_helpers.h
diff --git a/src/base/bind_internal.h b/base/bind_internal.h similarity index 100% rename from src/base/bind_internal.h rename to base/bind_internal.h
diff --git a/src/base/bind_unittest.cc b/base/bind_unittest.cc similarity index 100% rename from src/base/bind_unittest.cc rename to base/bind_unittest.cc
diff --git a/src/base/bind_unittest.nc b/base/bind_unittest.nc similarity index 100% rename from src/base/bind_unittest.nc rename to base/bind_unittest.nc
diff --git a/src/base/bit_cast.h b/base/bit_cast.h similarity index 100% rename from src/base/bit_cast.h rename to base/bit_cast.h
diff --git a/src/base/bit_cast_unittest.cc b/base/bit_cast_unittest.cc similarity index 100% rename from src/base/bit_cast_unittest.cc rename to base/bit_cast_unittest.cc
diff --git a/src/base/bits.h b/base/bits.h similarity index 100% rename from src/base/bits.h rename to base/bits.h
diff --git a/src/base/bits_unittest.cc b/base/bits_unittest.cc similarity index 100% rename from src/base/bits_unittest.cc rename to base/bits_unittest.cc
diff --git a/src/base/build_time.cc b/base/build_time.cc similarity index 100% rename from src/base/build_time.cc rename to base/build_time.cc
diff --git a/src/base/build_time.h b/base/build_time.h similarity index 100% rename from src/base/build_time.h rename to base/build_time.h
diff --git a/src/base/build_time_unittest.cc b/base/build_time_unittest.cc similarity index 100% rename from src/base/build_time_unittest.cc rename to base/build_time_unittest.cc
diff --git a/src/base/buildflag.h b/base/buildflag.h similarity index 100% rename from src/base/buildflag.h rename to base/buildflag.h
diff --git a/src/base/callback.h b/base/callback.h similarity index 100% rename from src/base/callback.h rename to base/callback.h
diff --git a/src/base/callback_forward.h b/base/callback_forward.h similarity index 100% rename from src/base/callback_forward.h rename to base/callback_forward.h
diff --git a/src/base/callback_helpers.cc b/base/callback_helpers.cc similarity index 100% rename from src/base/callback_helpers.cc rename to base/callback_helpers.cc
diff --git a/src/base/callback_helpers.h b/base/callback_helpers.h similarity index 100% rename from src/base/callback_helpers.h rename to base/callback_helpers.h
diff --git a/src/base/callback_helpers_unittest.cc b/base/callback_helpers_unittest.cc similarity index 100% rename from src/base/callback_helpers_unittest.cc rename to base/callback_helpers_unittest.cc
diff --git a/src/base/callback_internal.cc b/base/callback_internal.cc similarity index 100% rename from src/base/callback_internal.cc rename to base/callback_internal.cc
diff --git a/src/base/callback_internal.h b/base/callback_internal.h similarity index 100% rename from src/base/callback_internal.h rename to base/callback_internal.h
diff --git a/src/base/callback_list.h b/base/callback_list.h similarity index 100% rename from src/base/callback_list.h rename to base/callback_list.h
diff --git a/src/base/callback_list_unittest.cc b/base/callback_list_unittest.cc similarity index 100% rename from src/base/callback_list_unittest.cc rename to base/callback_list_unittest.cc
diff --git a/src/base/callback_list_unittest.nc b/base/callback_list_unittest.nc similarity index 100% rename from src/base/callback_list_unittest.nc rename to base/callback_list_unittest.nc
diff --git a/src/base/callback_unittest.cc b/base/callback_unittest.cc similarity index 100% rename from src/base/callback_unittest.cc rename to base/callback_unittest.cc
diff --git a/src/base/callback_unittest.nc b/base/callback_unittest.nc similarity index 100% rename from src/base/callback_unittest.nc rename to base/callback_unittest.nc
diff --git a/src/base/cancelable_callback.h b/base/cancelable_callback.h similarity index 100% rename from src/base/cancelable_callback.h rename to base/cancelable_callback.h
diff --git a/src/base/cancelable_callback_unittest.cc b/base/cancelable_callback_unittest.cc similarity index 100% rename from src/base/cancelable_callback_unittest.cc rename to base/cancelable_callback_unittest.cc
diff --git a/src/base/cfi_buildflags.h b/base/cfi_buildflags.h similarity index 100% rename from src/base/cfi_buildflags.h rename to base/cfi_buildflags.h
diff --git a/src/base/check_example.cc b/base/check_example.cc similarity index 100% rename from src/base/check_example.cc rename to base/check_example.cc
diff --git a/src/base/command_line.cc b/base/command_line.cc similarity index 100% rename from src/base/command_line.cc rename to base/command_line.cc
diff --git a/src/base/command_line.h b/base/command_line.h similarity index 100% rename from src/base/command_line.h rename to base/command_line.h
diff --git a/src/base/command_line_unittest.cc b/base/command_line_unittest.cc similarity index 100% rename from src/base/command_line_unittest.cc rename to base/command_line_unittest.cc
diff --git a/src/base/compiler_specific.h b/base/compiler_specific.h similarity index 100% rename from src/base/compiler_specific.h rename to base/compiler_specific.h
diff --git a/src/base/component_export.h b/base/component_export.h similarity index 100% rename from src/base/component_export.h rename to base/component_export.h
diff --git a/src/base/component_export_unittest.cc b/base/component_export_unittest.cc similarity index 100% rename from src/base/component_export_unittest.cc rename to base/component_export_unittest.cc
diff --git a/src/base/containers/README.md b/base/containers/README.md similarity index 100% rename from src/base/containers/README.md rename to base/containers/README.md
diff --git a/src/base/containers/adapters.h b/base/containers/adapters.h similarity index 100% rename from src/base/containers/adapters.h rename to base/containers/adapters.h
diff --git a/src/base/containers/adapters_unittest.cc b/base/containers/adapters_unittest.cc similarity index 100% rename from src/base/containers/adapters_unittest.cc rename to base/containers/adapters_unittest.cc
diff --git a/src/base/containers/checked_iterators.h b/base/containers/checked_iterators.h similarity index 100% rename from src/base/containers/checked_iterators.h rename to base/containers/checked_iterators.h
diff --git a/src/base/containers/circular_deque.h b/base/containers/circular_deque.h similarity index 100% rename from src/base/containers/circular_deque.h rename to base/containers/circular_deque.h
diff --git a/src/base/containers/circular_deque_unittest.cc b/base/containers/circular_deque_unittest.cc similarity index 100% rename from src/base/containers/circular_deque_unittest.cc rename to base/containers/circular_deque_unittest.cc
diff --git a/src/base/containers/flat_map.h b/base/containers/flat_map.h similarity index 100% rename from src/base/containers/flat_map.h rename to base/containers/flat_map.h
diff --git a/src/base/containers/flat_map_unittest.cc b/base/containers/flat_map_unittest.cc similarity index 100% rename from src/base/containers/flat_map_unittest.cc rename to base/containers/flat_map_unittest.cc
diff --git a/src/base/containers/flat_set.h b/base/containers/flat_set.h similarity index 100% rename from src/base/containers/flat_set.h rename to base/containers/flat_set.h
diff --git a/src/base/containers/flat_set_unittest.cc b/base/containers/flat_set_unittest.cc similarity index 100% rename from src/base/containers/flat_set_unittest.cc rename to base/containers/flat_set_unittest.cc
diff --git a/src/base/containers/flat_tree.h b/base/containers/flat_tree.h similarity index 100% rename from src/base/containers/flat_tree.h rename to base/containers/flat_tree.h
diff --git a/src/base/containers/flat_tree_unittest.cc b/base/containers/flat_tree_unittest.cc similarity index 100% rename from src/base/containers/flat_tree_unittest.cc rename to base/containers/flat_tree_unittest.cc
diff --git a/src/base/containers/hash_tables.h b/base/containers/hash_tables.h similarity index 100% rename from src/base/containers/hash_tables.h rename to base/containers/hash_tables.h
diff --git a/src/base/containers/hash_tables_unittest.cc b/base/containers/hash_tables_unittest.cc similarity index 100% rename from src/base/containers/hash_tables_unittest.cc rename to base/containers/hash_tables_unittest.cc
diff --git a/src/base/containers/id_map.h b/base/containers/id_map.h similarity index 100% rename from src/base/containers/id_map.h rename to base/containers/id_map.h
diff --git a/src/base/containers/id_map_unittest.cc b/base/containers/id_map_unittest.cc similarity index 100% rename from src/base/containers/id_map_unittest.cc rename to base/containers/id_map_unittest.cc
diff --git a/src/base/containers/linked_list.h b/base/containers/linked_list.h similarity index 100% rename from src/base/containers/linked_list.h rename to base/containers/linked_list.h
diff --git a/src/base/containers/linked_list_unittest.cc b/base/containers/linked_list_unittest.cc similarity index 100% rename from src/base/containers/linked_list_unittest.cc rename to base/containers/linked_list_unittest.cc
diff --git a/src/base/containers/mru_cache.h b/base/containers/mru_cache.h similarity index 100% rename from src/base/containers/mru_cache.h rename to base/containers/mru_cache.h
diff --git a/src/base/containers/mru_cache_unittest.cc b/base/containers/mru_cache_unittest.cc similarity index 100% rename from src/base/containers/mru_cache_unittest.cc rename to base/containers/mru_cache_unittest.cc
diff --git a/src/base/containers/queue.h b/base/containers/queue.h similarity index 100% rename from src/base/containers/queue.h rename to base/containers/queue.h
diff --git a/src/base/containers/ring_buffer.h b/base/containers/ring_buffer.h similarity index 100% rename from src/base/containers/ring_buffer.h rename to base/containers/ring_buffer.h
diff --git a/src/base/containers/small_map.h b/base/containers/small_map.h similarity index 100% rename from src/base/containers/small_map.h rename to base/containers/small_map.h
diff --git a/src/base/containers/small_map_unittest.cc b/base/containers/small_map_unittest.cc similarity index 100% rename from src/base/containers/small_map_unittest.cc rename to base/containers/small_map_unittest.cc
diff --git a/src/base/containers/span.h b/base/containers/span.h similarity index 100% rename from src/base/containers/span.h rename to base/containers/span.h
diff --git a/src/base/containers/span_unittest.cc b/base/containers/span_unittest.cc similarity index 100% rename from src/base/containers/span_unittest.cc rename to base/containers/span_unittest.cc
diff --git a/src/base/containers/span_unittest.nc b/base/containers/span_unittest.nc similarity index 100% rename from src/base/containers/span_unittest.nc rename to base/containers/span_unittest.nc
diff --git a/src/base/containers/stack.h b/base/containers/stack.h similarity index 100% rename from src/base/containers/stack.h rename to base/containers/stack.h
diff --git a/src/base/containers/stack_container.h b/base/containers/stack_container.h similarity index 100% rename from src/base/containers/stack_container.h rename to base/containers/stack_container.h
diff --git a/src/base/containers/stack_container_unittest.cc b/base/containers/stack_container_unittest.cc similarity index 100% rename from src/base/containers/stack_container_unittest.cc rename to base/containers/stack_container_unittest.cc
diff --git a/src/base/containers/unique_ptr_adapters.h b/base/containers/unique_ptr_adapters.h similarity index 100% rename from src/base/containers/unique_ptr_adapters.h rename to base/containers/unique_ptr_adapters.h
diff --git a/src/base/containers/unique_ptr_adapters_unittest.cc b/base/containers/unique_ptr_adapters_unittest.cc similarity index 100% rename from src/base/containers/unique_ptr_adapters_unittest.cc rename to base/containers/unique_ptr_adapters_unittest.cc
diff --git a/src/base/containers/vector_buffer.h b/base/containers/vector_buffer.h similarity index 100% rename from src/base/containers/vector_buffer.h rename to base/containers/vector_buffer.h
diff --git a/src/base/containers/vector_buffer_unittest.cc b/base/containers/vector_buffer_unittest.cc similarity index 100% rename from src/base/containers/vector_buffer_unittest.cc rename to base/containers/vector_buffer_unittest.cc
diff --git a/src/base/cpu.cc b/base/cpu.cc similarity index 100% rename from src/base/cpu.cc rename to base/cpu.cc
diff --git a/src/base/cpu.h b/base/cpu.h similarity index 100% rename from src/base/cpu.h rename to base/cpu.h
diff --git a/src/base/cpu_unittest.cc b/base/cpu_unittest.cc similarity index 100% rename from src/base/cpu_unittest.cc rename to base/cpu_unittest.cc
diff --git a/src/base/critical_closure.h b/base/critical_closure.h similarity index 100% rename from src/base/critical_closure.h rename to base/critical_closure.h
diff --git a/src/base/critical_closure_internal_ios.mm b/base/critical_closure_internal_ios.mm similarity index 100% rename from src/base/critical_closure_internal_ios.mm rename to base/critical_closure_internal_ios.mm
diff --git a/src/base/debug/activity_analyzer.cc b/base/debug/activity_analyzer.cc similarity index 100% rename from src/base/debug/activity_analyzer.cc rename to base/debug/activity_analyzer.cc
diff --git a/src/base/debug/activity_analyzer.h b/base/debug/activity_analyzer.h similarity index 100% rename from src/base/debug/activity_analyzer.h rename to base/debug/activity_analyzer.h
diff --git a/src/base/debug/activity_analyzer_unittest.cc b/base/debug/activity_analyzer_unittest.cc similarity index 100% rename from src/base/debug/activity_analyzer_unittest.cc rename to base/debug/activity_analyzer_unittest.cc
diff --git a/src/base/debug/activity_tracker.cc b/base/debug/activity_tracker.cc similarity index 100% rename from src/base/debug/activity_tracker.cc rename to base/debug/activity_tracker.cc
diff --git a/src/base/debug/activity_tracker.h b/base/debug/activity_tracker.h similarity index 100% rename from src/base/debug/activity_tracker.h rename to base/debug/activity_tracker.h
diff --git a/src/base/debug/activity_tracker_unittest.cc b/base/debug/activity_tracker_unittest.cc similarity index 100% rename from src/base/debug/activity_tracker_unittest.cc rename to base/debug/activity_tracker_unittest.cc
diff --git a/src/base/debug/alias.cc b/base/debug/alias.cc similarity index 100% rename from src/base/debug/alias.cc rename to base/debug/alias.cc
diff --git a/src/base/debug/alias.h b/base/debug/alias.h similarity index 100% rename from src/base/debug/alias.h rename to base/debug/alias.h
diff --git a/src/base/debug/alias_unittest.cc b/base/debug/alias_unittest.cc similarity index 100% rename from src/base/debug/alias_unittest.cc rename to base/debug/alias_unittest.cc
diff --git a/src/base/debug/asan_invalid_access.cc b/base/debug/asan_invalid_access.cc similarity index 100% rename from src/base/debug/asan_invalid_access.cc rename to base/debug/asan_invalid_access.cc
diff --git a/src/base/debug/asan_invalid_access.h b/base/debug/asan_invalid_access.h similarity index 100% rename from src/base/debug/asan_invalid_access.h rename to base/debug/asan_invalid_access.h
diff --git a/src/base/debug/close_handle_hook_win.cc b/base/debug/close_handle_hook_win.cc similarity index 100% rename from src/base/debug/close_handle_hook_win.cc rename to base/debug/close_handle_hook_win.cc
diff --git a/src/base/debug/close_handle_hook_win.h b/base/debug/close_handle_hook_win.h similarity index 100% rename from src/base/debug/close_handle_hook_win.h rename to base/debug/close_handle_hook_win.h
diff --git a/src/base/debug/crash_logging.cc b/base/debug/crash_logging.cc similarity index 100% rename from src/base/debug/crash_logging.cc rename to base/debug/crash_logging.cc
diff --git a/src/base/debug/crash_logging.h b/base/debug/crash_logging.h similarity index 100% rename from src/base/debug/crash_logging.h rename to base/debug/crash_logging.h
diff --git a/src/base/debug/crash_logging_unittest.cc b/base/debug/crash_logging_unittest.cc similarity index 100% rename from src/base/debug/crash_logging_unittest.cc rename to base/debug/crash_logging_unittest.cc
diff --git a/src/base/debug/debugger.cc b/base/debug/debugger.cc similarity index 100% rename from src/base/debug/debugger.cc rename to base/debug/debugger.cc
diff --git a/src/base/debug/debugger.h b/base/debug/debugger.h similarity index 100% rename from src/base/debug/debugger.h rename to base/debug/debugger.h
diff --git a/src/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc similarity index 100% rename from src/base/debug/debugger_posix.cc rename to base/debug/debugger_posix.cc
diff --git a/src/base/debug/debugger_starboard.cc b/base/debug/debugger_starboard.cc similarity index 100% rename from src/base/debug/debugger_starboard.cc rename to base/debug/debugger_starboard.cc
diff --git a/src/base/debug/debugger_unittest.cc b/base/debug/debugger_unittest.cc similarity index 100% rename from src/base/debug/debugger_unittest.cc rename to base/debug/debugger_unittest.cc
diff --git a/src/base/debug/debugger_win.cc b/base/debug/debugger_win.cc similarity index 100% rename from src/base/debug/debugger_win.cc rename to base/debug/debugger_win.cc
diff --git a/src/base/debug/debugging_buildflags.h b/base/debug/debugging_buildflags.h similarity index 100% rename from src/base/debug/debugging_buildflags.h rename to base/debug/debugging_buildflags.h
diff --git a/src/base/debug/debugging_flags.h b/base/debug/debugging_flags.h similarity index 100% rename from src/base/debug/debugging_flags.h rename to base/debug/debugging_flags.h
diff --git a/src/base/debug/dump_without_crashing.cc b/base/debug/dump_without_crashing.cc similarity index 100% rename from src/base/debug/dump_without_crashing.cc rename to base/debug/dump_without_crashing.cc
diff --git a/src/base/debug/dump_without_crashing.h b/base/debug/dump_without_crashing.h similarity index 100% rename from src/base/debug/dump_without_crashing.h rename to base/debug/dump_without_crashing.h
diff --git a/src/base/debug/elf_reader_linux.cc b/base/debug/elf_reader_linux.cc similarity index 100% rename from src/base/debug/elf_reader_linux.cc rename to base/debug/elf_reader_linux.cc
diff --git a/src/base/debug/elf_reader_linux.h b/base/debug/elf_reader_linux.h similarity index 100% rename from src/base/debug/elf_reader_linux.h rename to base/debug/elf_reader_linux.h
diff --git a/src/base/debug/elf_reader_linux_unittest.cc b/base/debug/elf_reader_linux_unittest.cc similarity index 100% rename from src/base/debug/elf_reader_linux_unittest.cc rename to base/debug/elf_reader_linux_unittest.cc
diff --git a/src/base/debug/gdi_debug_util_win.cc b/base/debug/gdi_debug_util_win.cc similarity index 100% rename from src/base/debug/gdi_debug_util_win.cc rename to base/debug/gdi_debug_util_win.cc
diff --git a/src/base/debug/gdi_debug_util_win.h b/base/debug/gdi_debug_util_win.h similarity index 100% rename from src/base/debug/gdi_debug_util_win.h rename to base/debug/gdi_debug_util_win.h
diff --git a/src/base/debug/invalid_access_win.cc b/base/debug/invalid_access_win.cc similarity index 100% rename from src/base/debug/invalid_access_win.cc rename to base/debug/invalid_access_win.cc
diff --git a/src/base/debug/invalid_access_win.h b/base/debug/invalid_access_win.h similarity index 100% rename from src/base/debug/invalid_access_win.h rename to base/debug/invalid_access_win.h
diff --git a/src/base/debug/leak_annotations.h b/base/debug/leak_annotations.h similarity index 100% rename from src/base/debug/leak_annotations.h rename to base/debug/leak_annotations.h
diff --git a/src/base/debug/leak_tracker.h b/base/debug/leak_tracker.h similarity index 100% rename from src/base/debug/leak_tracker.h rename to base/debug/leak_tracker.h
diff --git a/src/base/debug/leak_tracker_unittest.cc b/base/debug/leak_tracker_unittest.cc similarity index 100% rename from src/base/debug/leak_tracker_unittest.cc rename to base/debug/leak_tracker_unittest.cc
diff --git a/src/base/debug/proc_maps_linux.cc b/base/debug/proc_maps_linux.cc similarity index 100% rename from src/base/debug/proc_maps_linux.cc rename to base/debug/proc_maps_linux.cc
diff --git a/src/base/debug/proc_maps_linux.h b/base/debug/proc_maps_linux.h similarity index 100% rename from src/base/debug/proc_maps_linux.h rename to base/debug/proc_maps_linux.h
diff --git a/src/base/debug/proc_maps_linux_unittest.cc b/base/debug/proc_maps_linux_unittest.cc similarity index 100% rename from src/base/debug/proc_maps_linux_unittest.cc rename to base/debug/proc_maps_linux_unittest.cc
diff --git a/src/base/debug/profiler.cc b/base/debug/profiler.cc similarity index 100% rename from src/base/debug/profiler.cc rename to base/debug/profiler.cc
diff --git a/src/base/debug/profiler.h b/base/debug/profiler.h similarity index 100% rename from src/base/debug/profiler.h rename to base/debug/profiler.h
diff --git a/src/base/debug/stack_trace.cc b/base/debug/stack_trace.cc similarity index 100% rename from src/base/debug/stack_trace.cc rename to base/debug/stack_trace.cc
diff --git a/src/base/debug/stack_trace.h b/base/debug/stack_trace.h similarity index 100% rename from src/base/debug/stack_trace.h rename to base/debug/stack_trace.h
diff --git a/src/base/debug/stack_trace_android.cc b/base/debug/stack_trace_android.cc similarity index 100% rename from src/base/debug/stack_trace_android.cc rename to base/debug/stack_trace_android.cc
diff --git a/src/base/debug/stack_trace_fuchsia.cc b/base/debug/stack_trace_fuchsia.cc similarity index 100% rename from src/base/debug/stack_trace_fuchsia.cc rename to base/debug/stack_trace_fuchsia.cc
diff --git a/src/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc similarity index 100% rename from src/base/debug/stack_trace_posix.cc rename to base/debug/stack_trace_posix.cc
diff --git a/src/base/debug/stack_trace_starboard.cc b/base/debug/stack_trace_starboard.cc similarity index 100% rename from src/base/debug/stack_trace_starboard.cc rename to base/debug/stack_trace_starboard.cc
diff --git a/src/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc similarity index 100% rename from src/base/debug/stack_trace_unittest.cc rename to base/debug/stack_trace_unittest.cc
diff --git a/src/base/debug/stack_trace_win.cc b/base/debug/stack_trace_win.cc similarity index 100% rename from src/base/debug/stack_trace_win.cc rename to base/debug/stack_trace_win.cc
diff --git a/src/base/debug/task_annotator.cc b/base/debug/task_annotator.cc similarity index 100% rename from src/base/debug/task_annotator.cc rename to base/debug/task_annotator.cc
diff --git a/src/base/debug/task_annotator.h b/base/debug/task_annotator.h similarity index 100% rename from src/base/debug/task_annotator.h rename to base/debug/task_annotator.h
diff --git a/src/base/debug/task_annotator_unittest.cc b/base/debug/task_annotator_unittest.cc similarity index 100% rename from src/base/debug/task_annotator_unittest.cc rename to base/debug/task_annotator_unittest.cc
diff --git a/src/base/debug/thread_heap_usage_tracker.cc b/base/debug/thread_heap_usage_tracker.cc similarity index 100% rename from src/base/debug/thread_heap_usage_tracker.cc rename to base/debug/thread_heap_usage_tracker.cc
diff --git a/src/base/debug/thread_heap_usage_tracker.h b/base/debug/thread_heap_usage_tracker.h similarity index 100% rename from src/base/debug/thread_heap_usage_tracker.h rename to base/debug/thread_heap_usage_tracker.h
diff --git a/src/base/debug/thread_heap_usage_tracker_unittest.cc b/base/debug/thread_heap_usage_tracker_unittest.cc similarity index 100% rename from src/base/debug/thread_heap_usage_tracker_unittest.cc rename to base/debug/thread_heap_usage_tracker_unittest.cc
diff --git a/src/base/deferred_sequenced_task_runner.cc b/base/deferred_sequenced_task_runner.cc similarity index 100% rename from src/base/deferred_sequenced_task_runner.cc rename to base/deferred_sequenced_task_runner.cc
diff --git a/src/base/deferred_sequenced_task_runner.h b/base/deferred_sequenced_task_runner.h similarity index 100% rename from src/base/deferred_sequenced_task_runner.h rename to base/deferred_sequenced_task_runner.h
diff --git a/src/base/deferred_sequenced_task_runner_unittest.cc b/base/deferred_sequenced_task_runner_unittest.cc similarity index 100% rename from src/base/deferred_sequenced_task_runner_unittest.cc rename to base/deferred_sequenced_task_runner_unittest.cc
diff --git a/src/base/environment.cc b/base/environment.cc similarity index 100% rename from src/base/environment.cc rename to base/environment.cc
diff --git a/src/base/environment.h b/base/environment.h similarity index 100% rename from src/base/environment.h rename to base/environment.h
diff --git a/src/base/environment_unittest.cc b/base/environment_unittest.cc similarity index 100% rename from src/base/environment_unittest.cc rename to base/environment_unittest.cc
diff --git a/src/base/export_template.h b/base/export_template.h similarity index 100% rename from src/base/export_template.h rename to base/export_template.h
diff --git a/src/base/feature_list.cc b/base/feature_list.cc similarity index 100% rename from src/base/feature_list.cc rename to base/feature_list.cc
diff --git a/src/base/feature_list.h b/base/feature_list.h similarity index 100% rename from src/base/feature_list.h rename to base/feature_list.h
diff --git a/src/base/feature_list_unittest.cc b/base/feature_list_unittest.cc similarity index 100% rename from src/base/feature_list_unittest.cc rename to base/feature_list_unittest.cc
diff --git a/src/base/file_descriptor_posix.h b/base/file_descriptor_posix.h similarity index 100% rename from src/base/file_descriptor_posix.h rename to base/file_descriptor_posix.h
diff --git a/src/base/file_descriptor_store.cc b/base/file_descriptor_store.cc similarity index 100% rename from src/base/file_descriptor_store.cc rename to base/file_descriptor_store.cc
diff --git a/src/base/file_descriptor_store.h b/base/file_descriptor_store.h similarity index 100% rename from src/base/file_descriptor_store.h rename to base/file_descriptor_store.h
diff --git a/src/base/file_version_info.h b/base/file_version_info.h similarity index 100% rename from src/base/file_version_info.h rename to base/file_version_info.h
diff --git a/src/base/file_version_info_mac.h b/base/file_version_info_mac.h similarity index 100% rename from src/base/file_version_info_mac.h rename to base/file_version_info_mac.h
diff --git a/src/base/file_version_info_mac.mm b/base/file_version_info_mac.mm similarity index 100% rename from src/base/file_version_info_mac.mm rename to base/file_version_info_mac.mm
diff --git a/src/base/file_version_info_win.cc b/base/file_version_info_win.cc similarity index 100% rename from src/base/file_version_info_win.cc rename to base/file_version_info_win.cc
diff --git a/src/base/file_version_info_win.h b/base/file_version_info_win.h similarity index 100% rename from src/base/file_version_info_win.h rename to base/file_version_info_win.h
diff --git a/src/base/file_version_info_win_unittest.cc b/base/file_version_info_win_unittest.cc similarity index 100% rename from src/base/file_version_info_win_unittest.cc rename to base/file_version_info_win_unittest.cc
diff --git a/src/base/files/dir_reader_fallback.h b/base/files/dir_reader_fallback.h similarity index 100% rename from src/base/files/dir_reader_fallback.h rename to base/files/dir_reader_fallback.h
diff --git a/src/base/files/dir_reader_linux.h b/base/files/dir_reader_linux.h similarity index 100% rename from src/base/files/dir_reader_linux.h rename to base/files/dir_reader_linux.h
diff --git a/src/base/files/dir_reader_posix.h b/base/files/dir_reader_posix.h similarity index 100% rename from src/base/files/dir_reader_posix.h rename to base/files/dir_reader_posix.h
diff --git a/src/base/files/dir_reader_posix_unittest.cc b/base/files/dir_reader_posix_unittest.cc similarity index 100% rename from src/base/files/dir_reader_posix_unittest.cc rename to base/files/dir_reader_posix_unittest.cc
diff --git a/src/base/files/file.cc b/base/files/file.cc similarity index 100% rename from src/base/files/file.cc rename to base/files/file.cc
diff --git a/src/base/files/file.h b/base/files/file.h similarity index 100% rename from src/base/files/file.h rename to base/files/file.h
diff --git a/src/base/files/file_descriptor_watcher_posix.cc b/base/files/file_descriptor_watcher_posix.cc similarity index 100% rename from src/base/files/file_descriptor_watcher_posix.cc rename to base/files/file_descriptor_watcher_posix.cc
diff --git a/src/base/files/file_descriptor_watcher_posix.h b/base/files/file_descriptor_watcher_posix.h similarity index 100% rename from src/base/files/file_descriptor_watcher_posix.h rename to base/files/file_descriptor_watcher_posix.h
diff --git a/src/base/files/file_descriptor_watcher_posix_unittest.cc b/base/files/file_descriptor_watcher_posix_unittest.cc similarity index 100% rename from src/base/files/file_descriptor_watcher_posix_unittest.cc rename to base/files/file_descriptor_watcher_posix_unittest.cc
diff --git a/src/base/files/file_enumerator.cc b/base/files/file_enumerator.cc similarity index 100% rename from src/base/files/file_enumerator.cc rename to base/files/file_enumerator.cc
diff --git a/src/base/files/file_enumerator.h b/base/files/file_enumerator.h similarity index 100% rename from src/base/files/file_enumerator.h rename to base/files/file_enumerator.h
diff --git a/src/base/files/file_enumerator_posix.cc b/base/files/file_enumerator_posix.cc similarity index 100% rename from src/base/files/file_enumerator_posix.cc rename to base/files/file_enumerator_posix.cc
diff --git a/src/base/files/file_enumerator_starboard.cc b/base/files/file_enumerator_starboard.cc similarity index 100% rename from src/base/files/file_enumerator_starboard.cc rename to base/files/file_enumerator_starboard.cc
diff --git a/src/base/files/file_enumerator_unittest.cc b/base/files/file_enumerator_unittest.cc similarity index 100% rename from src/base/files/file_enumerator_unittest.cc rename to base/files/file_enumerator_unittest.cc
diff --git a/src/base/files/file_enumerator_win.cc b/base/files/file_enumerator_win.cc similarity index 100% rename from src/base/files/file_enumerator_win.cc rename to base/files/file_enumerator_win.cc
diff --git a/src/base/files/file_locking_unittest.cc b/base/files/file_locking_unittest.cc similarity index 100% rename from src/base/files/file_locking_unittest.cc rename to base/files/file_locking_unittest.cc
diff --git a/src/base/files/file_path.cc b/base/files/file_path.cc similarity index 100% rename from src/base/files/file_path.cc rename to base/files/file_path.cc
diff --git a/src/base/files/file_path.h b/base/files/file_path.h similarity index 100% rename from src/base/files/file_path.h rename to base/files/file_path.h
diff --git a/src/base/files/file_path_constants.cc b/base/files/file_path_constants.cc similarity index 100% rename from src/base/files/file_path_constants.cc rename to base/files/file_path_constants.cc
diff --git a/src/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc similarity index 100% rename from src/base/files/file_path_unittest.cc rename to base/files/file_path_unittest.cc
diff --git a/src/base/files/file_path_watcher.cc b/base/files/file_path_watcher.cc similarity index 100% rename from src/base/files/file_path_watcher.cc rename to base/files/file_path_watcher.cc
diff --git a/src/base/files/file_path_watcher.h b/base/files/file_path_watcher.h similarity index 100% rename from src/base/files/file_path_watcher.h rename to base/files/file_path_watcher.h
diff --git a/src/base/files/file_path_watcher_fsevents.cc b/base/files/file_path_watcher_fsevents.cc similarity index 100% rename from src/base/files/file_path_watcher_fsevents.cc rename to base/files/file_path_watcher_fsevents.cc
diff --git a/src/base/files/file_path_watcher_fsevents.h b/base/files/file_path_watcher_fsevents.h similarity index 100% rename from src/base/files/file_path_watcher_fsevents.h rename to base/files/file_path_watcher_fsevents.h
diff --git a/src/base/files/file_path_watcher_fuchsia.cc b/base/files/file_path_watcher_fuchsia.cc similarity index 100% rename from src/base/files/file_path_watcher_fuchsia.cc rename to base/files/file_path_watcher_fuchsia.cc
diff --git a/src/base/files/file_path_watcher_kqueue.cc b/base/files/file_path_watcher_kqueue.cc similarity index 100% rename from src/base/files/file_path_watcher_kqueue.cc rename to base/files/file_path_watcher_kqueue.cc
diff --git a/src/base/files/file_path_watcher_kqueue.h b/base/files/file_path_watcher_kqueue.h similarity index 100% rename from src/base/files/file_path_watcher_kqueue.h rename to base/files/file_path_watcher_kqueue.h
diff --git a/src/base/files/file_path_watcher_linux.cc b/base/files/file_path_watcher_linux.cc similarity index 100% rename from src/base/files/file_path_watcher_linux.cc rename to base/files/file_path_watcher_linux.cc
diff --git a/src/base/files/file_path_watcher_mac.cc b/base/files/file_path_watcher_mac.cc similarity index 100% rename from src/base/files/file_path_watcher_mac.cc rename to base/files/file_path_watcher_mac.cc
diff --git a/src/base/files/file_path_watcher_stub.cc b/base/files/file_path_watcher_stub.cc similarity index 100% rename from src/base/files/file_path_watcher_stub.cc rename to base/files/file_path_watcher_stub.cc
diff --git a/src/base/files/file_path_watcher_unittest.cc b/base/files/file_path_watcher_unittest.cc similarity index 100% rename from src/base/files/file_path_watcher_unittest.cc rename to base/files/file_path_watcher_unittest.cc
diff --git a/src/base/files/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc similarity index 100% rename from src/base/files/file_path_watcher_win.cc rename to base/files/file_path_watcher_win.cc
diff --git a/src/base/files/file_posix.cc b/base/files/file_posix.cc similarity index 100% rename from src/base/files/file_posix.cc rename to base/files/file_posix.cc
diff --git a/src/base/files/file_proxy.cc b/base/files/file_proxy.cc similarity index 100% rename from src/base/files/file_proxy.cc rename to base/files/file_proxy.cc
diff --git a/src/base/files/file_proxy.h b/base/files/file_proxy.h similarity index 100% rename from src/base/files/file_proxy.h rename to base/files/file_proxy.h
diff --git a/src/base/files/file_proxy_unittest.cc b/base/files/file_proxy_unittest.cc similarity index 100% rename from src/base/files/file_proxy_unittest.cc rename to base/files/file_proxy_unittest.cc
diff --git a/src/base/files/file_starboard.cc b/base/files/file_starboard.cc similarity index 100% rename from src/base/files/file_starboard.cc rename to base/files/file_starboard.cc
diff --git a/src/base/files/file_tracing.cc b/base/files/file_tracing.cc similarity index 100% rename from src/base/files/file_tracing.cc rename to base/files/file_tracing.cc
diff --git a/src/base/files/file_tracing.h b/base/files/file_tracing.h similarity index 100% rename from src/base/files/file_tracing.h rename to base/files/file_tracing.h
diff --git a/src/base/files/file_unittest.cc b/base/files/file_unittest.cc similarity index 100% rename from src/base/files/file_unittest.cc rename to base/files/file_unittest.cc
diff --git a/src/base/files/file_util.cc b/base/files/file_util.cc similarity index 100% rename from src/base/files/file_util.cc rename to base/files/file_util.cc
diff --git a/src/base/files/file_util.h b/base/files/file_util.h similarity index 100% rename from src/base/files/file_util.h rename to base/files/file_util.h
diff --git a/src/base/files/file_util_android.cc b/base/files/file_util_android.cc similarity index 100% rename from src/base/files/file_util_android.cc rename to base/files/file_util_android.cc
diff --git a/src/base/files/file_util_linux.cc b/base/files/file_util_linux.cc similarity index 100% rename from src/base/files/file_util_linux.cc rename to base/files/file_util_linux.cc
diff --git a/src/base/files/file_util_mac.mm b/base/files/file_util_mac.mm similarity index 100% rename from src/base/files/file_util_mac.mm rename to base/files/file_util_mac.mm
diff --git a/src/base/files/file_util_posix.cc b/base/files/file_util_posix.cc similarity index 100% rename from src/base/files/file_util_posix.cc rename to base/files/file_util_posix.cc
diff --git a/src/base/files/file_util_starboard.cc b/base/files/file_util_starboard.cc similarity index 100% rename from src/base/files/file_util_starboard.cc rename to base/files/file_util_starboard.cc
diff --git a/src/base/files/file_util_unittest.cc b/base/files/file_util_unittest.cc similarity index 100% rename from src/base/files/file_util_unittest.cc rename to base/files/file_util_unittest.cc
diff --git a/src/base/files/file_util_win.cc b/base/files/file_util_win.cc similarity index 100% rename from src/base/files/file_util_win.cc rename to base/files/file_util_win.cc
diff --git a/src/base/files/file_win.cc b/base/files/file_win.cc similarity index 100% rename from src/base/files/file_win.cc rename to base/files/file_win.cc
diff --git a/src/base/files/important_file_writer.cc b/base/files/important_file_writer.cc similarity index 100% rename from src/base/files/important_file_writer.cc rename to base/files/important_file_writer.cc
diff --git a/src/base/files/important_file_writer.h b/base/files/important_file_writer.h similarity index 100% rename from src/base/files/important_file_writer.h rename to base/files/important_file_writer.h
diff --git a/src/base/files/important_file_writer_unittest.cc b/base/files/important_file_writer_unittest.cc similarity index 100% rename from src/base/files/important_file_writer_unittest.cc rename to base/files/important_file_writer_unittest.cc
diff --git a/src/base/files/memory_mapped_file.cc b/base/files/memory_mapped_file.cc similarity index 100% rename from src/base/files/memory_mapped_file.cc rename to base/files/memory_mapped_file.cc
diff --git a/src/base/files/memory_mapped_file.h b/base/files/memory_mapped_file.h similarity index 100% rename from src/base/files/memory_mapped_file.h rename to base/files/memory_mapped_file.h
diff --git a/src/base/files/memory_mapped_file_posix.cc b/base/files/memory_mapped_file_posix.cc similarity index 100% rename from src/base/files/memory_mapped_file_posix.cc rename to base/files/memory_mapped_file_posix.cc
diff --git a/src/base/files/memory_mapped_file_unittest.cc b/base/files/memory_mapped_file_unittest.cc similarity index 100% rename from src/base/files/memory_mapped_file_unittest.cc rename to base/files/memory_mapped_file_unittest.cc
diff --git a/src/base/files/memory_mapped_file_win.cc b/base/files/memory_mapped_file_win.cc similarity index 100% rename from src/base/files/memory_mapped_file_win.cc rename to base/files/memory_mapped_file_win.cc
diff --git a/src/base/files/platform_file.h b/base/files/platform_file.h similarity index 100% rename from src/base/files/platform_file.h rename to base/files/platform_file.h
diff --git a/src/base/files/scoped_file.cc b/base/files/scoped_file.cc similarity index 100% rename from src/base/files/scoped_file.cc rename to base/files/scoped_file.cc
diff --git a/src/base/files/scoped_file.h b/base/files/scoped_file.h similarity index 100% rename from src/base/files/scoped_file.h rename to base/files/scoped_file.h
diff --git a/src/base/files/scoped_temp_dir.cc b/base/files/scoped_temp_dir.cc similarity index 100% rename from src/base/files/scoped_temp_dir.cc rename to base/files/scoped_temp_dir.cc
diff --git a/src/base/files/scoped_temp_dir.h b/base/files/scoped_temp_dir.h similarity index 100% rename from src/base/files/scoped_temp_dir.h rename to base/files/scoped_temp_dir.h
diff --git a/src/base/files/scoped_temp_dir_unittest.cc b/base/files/scoped_temp_dir_unittest.cc similarity index 100% rename from src/base/files/scoped_temp_dir_unittest.cc rename to base/files/scoped_temp_dir_unittest.cc
diff --git a/src/base/format_macros.h b/base/format_macros.h similarity index 100% rename from src/base/format_macros.h rename to base/format_macros.h
diff --git a/src/base/fuchsia/async_dispatcher.cc b/base/fuchsia/async_dispatcher.cc similarity index 100% rename from src/base/fuchsia/async_dispatcher.cc rename to base/fuchsia/async_dispatcher.cc
diff --git a/src/base/fuchsia/async_dispatcher.h b/base/fuchsia/async_dispatcher.h similarity index 100% rename from src/base/fuchsia/async_dispatcher.h rename to base/fuchsia/async_dispatcher.h
diff --git a/src/base/fuchsia/async_dispatcher_unittest.cc b/base/fuchsia/async_dispatcher_unittest.cc similarity index 100% rename from src/base/fuchsia/async_dispatcher_unittest.cc rename to base/fuchsia/async_dispatcher_unittest.cc
diff --git a/src/base/fuchsia/component_context.cc b/base/fuchsia/component_context.cc similarity index 100% rename from src/base/fuchsia/component_context.cc rename to base/fuchsia/component_context.cc
diff --git a/src/base/fuchsia/component_context.h b/base/fuchsia/component_context.h similarity index 100% rename from src/base/fuchsia/component_context.h rename to base/fuchsia/component_context.h
diff --git a/src/base/fuchsia/default_job.cc b/base/fuchsia/default_job.cc similarity index 100% rename from src/base/fuchsia/default_job.cc rename to base/fuchsia/default_job.cc
diff --git a/src/base/fuchsia/default_job.h b/base/fuchsia/default_job.h similarity index 100% rename from src/base/fuchsia/default_job.h rename to base/fuchsia/default_job.h
diff --git a/src/base/fuchsia/fidl_interface_request.cc b/base/fuchsia/fidl_interface_request.cc similarity index 100% rename from src/base/fuchsia/fidl_interface_request.cc rename to base/fuchsia/fidl_interface_request.cc
diff --git a/src/base/fuchsia/fidl_interface_request.h b/base/fuchsia/fidl_interface_request.h similarity index 100% rename from src/base/fuchsia/fidl_interface_request.h rename to base/fuchsia/fidl_interface_request.h
diff --git a/src/base/fuchsia/file_utils.cc b/base/fuchsia/file_utils.cc similarity index 100% rename from src/base/fuchsia/file_utils.cc rename to base/fuchsia/file_utils.cc
diff --git a/src/base/fuchsia/file_utils.h b/base/fuchsia/file_utils.h similarity index 100% rename from src/base/fuchsia/file_utils.h rename to base/fuchsia/file_utils.h
diff --git a/src/base/fuchsia/filtered_service_directory.cc b/base/fuchsia/filtered_service_directory.cc similarity index 100% rename from src/base/fuchsia/filtered_service_directory.cc rename to base/fuchsia/filtered_service_directory.cc
diff --git a/src/base/fuchsia/filtered_service_directory.h b/base/fuchsia/filtered_service_directory.h similarity index 100% rename from src/base/fuchsia/filtered_service_directory.h rename to base/fuchsia/filtered_service_directory.h
diff --git a/src/base/fuchsia/filtered_service_directory_unittest.cc b/base/fuchsia/filtered_service_directory_unittest.cc similarity index 100% rename from src/base/fuchsia/filtered_service_directory_unittest.cc rename to base/fuchsia/filtered_service_directory_unittest.cc
diff --git a/src/base/fuchsia/fuchsia_logging.cc b/base/fuchsia/fuchsia_logging.cc similarity index 100% rename from src/base/fuchsia/fuchsia_logging.cc rename to base/fuchsia/fuchsia_logging.cc
diff --git a/src/base/fuchsia/fuchsia_logging.h b/base/fuchsia/fuchsia_logging.h similarity index 100% rename from src/base/fuchsia/fuchsia_logging.h rename to base/fuchsia/fuchsia_logging.h
diff --git a/src/base/fuchsia/scoped_service_binding.h b/base/fuchsia/scoped_service_binding.h similarity index 100% rename from src/base/fuchsia/scoped_service_binding.h rename to base/fuchsia/scoped_service_binding.h
diff --git a/src/base/fuchsia/service_directory.cc b/base/fuchsia/service_directory.cc similarity index 100% rename from src/base/fuchsia/service_directory.cc rename to base/fuchsia/service_directory.cc
diff --git a/src/base/fuchsia/service_directory.h b/base/fuchsia/service_directory.h similarity index 100% rename from src/base/fuchsia/service_directory.h rename to base/fuchsia/service_directory.h
diff --git a/src/base/fuchsia/service_directory_test_base.cc b/base/fuchsia/service_directory_test_base.cc similarity index 100% rename from src/base/fuchsia/service_directory_test_base.cc rename to base/fuchsia/service_directory_test_base.cc
diff --git a/src/base/fuchsia/service_directory_test_base.h b/base/fuchsia/service_directory_test_base.h similarity index 100% rename from src/base/fuchsia/service_directory_test_base.h rename to base/fuchsia/service_directory_test_base.h
diff --git a/src/base/fuchsia/service_directory_unittest.cc b/base/fuchsia/service_directory_unittest.cc similarity index 100% rename from src/base/fuchsia/service_directory_unittest.cc rename to base/fuchsia/service_directory_unittest.cc
diff --git a/src/base/fuchsia/test.fidl b/base/fuchsia/test.fidl similarity index 100% rename from src/base/fuchsia/test.fidl rename to base/fuchsia/test.fidl
diff --git a/src/base/gmock_unittest.cc b/base/gmock_unittest.cc similarity index 100% rename from src/base/gmock_unittest.cc rename to base/gmock_unittest.cc
diff --git a/src/base/gtest_prod_util.h b/base/gtest_prod_util.h similarity index 100% rename from src/base/gtest_prod_util.h rename to base/gtest_prod_util.h
diff --git a/src/base/guid.cc b/base/guid.cc similarity index 100% rename from src/base/guid.cc rename to base/guid.cc
diff --git a/src/base/guid.h b/base/guid.h similarity index 100% rename from src/base/guid.h rename to base/guid.h
diff --git a/src/base/guid_unittest.cc b/base/guid_unittest.cc similarity index 100% rename from src/base/guid_unittest.cc rename to base/guid_unittest.cc
diff --git a/src/base/hash.cc b/base/hash.cc similarity index 100% rename from src/base/hash.cc rename to base/hash.cc
diff --git a/src/base/hash.h b/base/hash.h similarity index 100% rename from src/base/hash.h rename to base/hash.h
diff --git a/src/base/hash_unittest.cc b/base/hash_unittest.cc similarity index 100% rename from src/base/hash_unittest.cc rename to base/hash_unittest.cc
diff --git a/src/base/i18n/base_i18n_export.h b/base/i18n/base_i18n_export.h similarity index 100% rename from src/base/i18n/base_i18n_export.h rename to base/i18n/base_i18n_export.h
diff --git a/src/base/i18n/base_i18n_switches.cc b/base/i18n/base_i18n_switches.cc similarity index 100% rename from src/base/i18n/base_i18n_switches.cc rename to base/i18n/base_i18n_switches.cc
diff --git a/src/base/i18n/base_i18n_switches.h b/base/i18n/base_i18n_switches.h similarity index 100% rename from src/base/i18n/base_i18n_switches.h rename to base/i18n/base_i18n_switches.h
diff --git a/src/base/i18n/bidi_line_iterator.cc b/base/i18n/bidi_line_iterator.cc similarity index 100% rename from src/base/i18n/bidi_line_iterator.cc rename to base/i18n/bidi_line_iterator.cc
diff --git a/src/base/i18n/bidi_line_iterator.h b/base/i18n/bidi_line_iterator.h similarity index 100% rename from src/base/i18n/bidi_line_iterator.h rename to base/i18n/bidi_line_iterator.h
diff --git a/src/base/i18n/bidi_line_iterator_unittest.cc b/base/i18n/bidi_line_iterator_unittest.cc similarity index 100% rename from src/base/i18n/bidi_line_iterator_unittest.cc rename to base/i18n/bidi_line_iterator_unittest.cc
diff --git a/src/base/i18n/break_iterator.cc b/base/i18n/break_iterator.cc similarity index 100% rename from src/base/i18n/break_iterator.cc rename to base/i18n/break_iterator.cc
diff --git a/src/base/i18n/break_iterator.h b/base/i18n/break_iterator.h similarity index 100% rename from src/base/i18n/break_iterator.h rename to base/i18n/break_iterator.h
diff --git a/src/base/i18n/break_iterator_unittest.cc b/base/i18n/break_iterator_unittest.cc similarity index 100% rename from src/base/i18n/break_iterator_unittest.cc rename to base/i18n/break_iterator_unittest.cc
diff --git a/src/base/i18n/build_utf8_validator_tables.cc b/base/i18n/build_utf8_validator_tables.cc similarity index 100% rename from src/base/i18n/build_utf8_validator_tables.cc rename to base/i18n/build_utf8_validator_tables.cc
diff --git a/src/base/i18n/case_conversion.cc b/base/i18n/case_conversion.cc similarity index 100% rename from src/base/i18n/case_conversion.cc rename to base/i18n/case_conversion.cc
diff --git a/src/base/i18n/case_conversion.h b/base/i18n/case_conversion.h similarity index 100% rename from src/base/i18n/case_conversion.h rename to base/i18n/case_conversion.h
diff --git a/src/base/i18n/case_conversion_unittest.cc b/base/i18n/case_conversion_unittest.cc similarity index 100% rename from src/base/i18n/case_conversion_unittest.cc rename to base/i18n/case_conversion_unittest.cc
diff --git a/src/base/i18n/char_iterator.cc b/base/i18n/char_iterator.cc similarity index 100% rename from src/base/i18n/char_iterator.cc rename to base/i18n/char_iterator.cc
diff --git a/src/base/i18n/char_iterator.h b/base/i18n/char_iterator.h similarity index 100% rename from src/base/i18n/char_iterator.h rename to base/i18n/char_iterator.h
diff --git a/src/base/i18n/char_iterator_unittest.cc b/base/i18n/char_iterator_unittest.cc similarity index 100% rename from src/base/i18n/char_iterator_unittest.cc rename to base/i18n/char_iterator_unittest.cc
diff --git a/src/base/i18n/character_encoding.cc b/base/i18n/character_encoding.cc similarity index 100% rename from src/base/i18n/character_encoding.cc rename to base/i18n/character_encoding.cc
diff --git a/src/base/i18n/character_encoding.h b/base/i18n/character_encoding.h similarity index 100% rename from src/base/i18n/character_encoding.h rename to base/i18n/character_encoding.h
diff --git a/src/base/i18n/character_encoding_unittest.cc b/base/i18n/character_encoding_unittest.cc similarity index 100% rename from src/base/i18n/character_encoding_unittest.cc rename to base/i18n/character_encoding_unittest.cc
diff --git a/src/base/i18n/encoding_detection.cc b/base/i18n/encoding_detection.cc similarity index 100% rename from src/base/i18n/encoding_detection.cc rename to base/i18n/encoding_detection.cc
diff --git a/src/base/i18n/encoding_detection.h b/base/i18n/encoding_detection.h similarity index 100% rename from src/base/i18n/encoding_detection.h rename to base/i18n/encoding_detection.h
diff --git a/src/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc similarity index 100% rename from src/base/i18n/file_util_icu.cc rename to base/i18n/file_util_icu.cc
diff --git a/src/base/i18n/file_util_icu.h b/base/i18n/file_util_icu.h similarity index 100% rename from src/base/i18n/file_util_icu.h rename to base/i18n/file_util_icu.h
diff --git a/src/base/i18n/file_util_icu_unittest.cc b/base/i18n/file_util_icu_unittest.cc similarity index 100% rename from src/base/i18n/file_util_icu_unittest.cc rename to base/i18n/file_util_icu_unittest.cc
diff --git a/src/base/i18n/i18n_constants.cc b/base/i18n/i18n_constants.cc similarity index 100% rename from src/base/i18n/i18n_constants.cc rename to base/i18n/i18n_constants.cc
diff --git a/src/base/i18n/i18n_constants.h b/base/i18n/i18n_constants.h similarity index 100% rename from src/base/i18n/i18n_constants.h rename to base/i18n/i18n_constants.h
diff --git a/src/base/i18n/icu_string_conversions.cc b/base/i18n/icu_string_conversions.cc similarity index 100% rename from src/base/i18n/icu_string_conversions.cc rename to base/i18n/icu_string_conversions.cc
diff --git a/src/base/i18n/icu_string_conversions.h b/base/i18n/icu_string_conversions.h similarity index 100% rename from src/base/i18n/icu_string_conversions.h rename to base/i18n/icu_string_conversions.h
diff --git a/src/base/i18n/icu_string_conversions_unittest.cc b/base/i18n/icu_string_conversions_unittest.cc similarity index 100% rename from src/base/i18n/icu_string_conversions_unittest.cc rename to base/i18n/icu_string_conversions_unittest.cc
diff --git a/src/base/i18n/icu_util.cc b/base/i18n/icu_util.cc similarity index 100% rename from src/base/i18n/icu_util.cc rename to base/i18n/icu_util.cc
diff --git a/src/base/i18n/icu_util.h b/base/i18n/icu_util.h similarity index 100% rename from src/base/i18n/icu_util.h rename to base/i18n/icu_util.h
diff --git a/src/base/i18n/message_formatter.cc b/base/i18n/message_formatter.cc similarity index 100% rename from src/base/i18n/message_formatter.cc rename to base/i18n/message_formatter.cc
diff --git a/src/base/i18n/message_formatter.h b/base/i18n/message_formatter.h similarity index 100% rename from src/base/i18n/message_formatter.h rename to base/i18n/message_formatter.h
diff --git a/src/base/i18n/message_formatter_unittest.cc b/base/i18n/message_formatter_unittest.cc similarity index 100% rename from src/base/i18n/message_formatter_unittest.cc rename to base/i18n/message_formatter_unittest.cc
diff --git a/src/base/i18n/number_formatting.cc b/base/i18n/number_formatting.cc similarity index 100% rename from src/base/i18n/number_formatting.cc rename to base/i18n/number_formatting.cc
diff --git a/src/base/i18n/number_formatting.h b/base/i18n/number_formatting.h similarity index 100% rename from src/base/i18n/number_formatting.h rename to base/i18n/number_formatting.h
diff --git a/src/base/i18n/number_formatting_unittest.cc b/base/i18n/number_formatting_unittest.cc similarity index 100% rename from src/base/i18n/number_formatting_unittest.cc rename to base/i18n/number_formatting_unittest.cc
diff --git a/src/base/i18n/rtl.cc b/base/i18n/rtl.cc similarity index 100% rename from src/base/i18n/rtl.cc rename to base/i18n/rtl.cc
diff --git a/src/base/i18n/rtl.h b/base/i18n/rtl.h similarity index 100% rename from src/base/i18n/rtl.h rename to base/i18n/rtl.h
diff --git a/src/base/i18n/rtl_unittest.cc b/base/i18n/rtl_unittest.cc similarity index 100% rename from src/base/i18n/rtl_unittest.cc rename to base/i18n/rtl_unittest.cc
diff --git a/src/base/i18n/streaming_utf8_validator.cc b/base/i18n/streaming_utf8_validator.cc similarity index 100% rename from src/base/i18n/streaming_utf8_validator.cc rename to base/i18n/streaming_utf8_validator.cc
diff --git a/src/base/i18n/streaming_utf8_validator.h b/base/i18n/streaming_utf8_validator.h similarity index 100% rename from src/base/i18n/streaming_utf8_validator.h rename to base/i18n/streaming_utf8_validator.h
diff --git a/src/base/i18n/streaming_utf8_validator_perftest.cc b/base/i18n/streaming_utf8_validator_perftest.cc similarity index 100% rename from src/base/i18n/streaming_utf8_validator_perftest.cc rename to base/i18n/streaming_utf8_validator_perftest.cc
diff --git a/src/base/i18n/streaming_utf8_validator_unittest.cc b/base/i18n/streaming_utf8_validator_unittest.cc similarity index 100% rename from src/base/i18n/streaming_utf8_validator_unittest.cc rename to base/i18n/streaming_utf8_validator_unittest.cc
diff --git a/src/base/i18n/string_compare.cc b/base/i18n/string_compare.cc similarity index 100% rename from src/base/i18n/string_compare.cc rename to base/i18n/string_compare.cc
diff --git a/src/base/i18n/string_compare.h b/base/i18n/string_compare.h similarity index 100% rename from src/base/i18n/string_compare.h rename to base/i18n/string_compare.h
diff --git a/src/base/i18n/string_search.cc b/base/i18n/string_search.cc similarity index 100% rename from src/base/i18n/string_search.cc rename to base/i18n/string_search.cc
diff --git a/src/base/i18n/string_search.h b/base/i18n/string_search.h similarity index 100% rename from src/base/i18n/string_search.h rename to base/i18n/string_search.h
diff --git a/src/base/i18n/string_search_unittest.cc b/base/i18n/string_search_unittest.cc similarity index 100% rename from src/base/i18n/string_search_unittest.cc rename to base/i18n/string_search_unittest.cc
diff --git a/src/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc similarity index 100% rename from src/base/i18n/time_formatting.cc rename to base/i18n/time_formatting.cc
diff --git a/src/base/i18n/time_formatting.h b/base/i18n/time_formatting.h similarity index 100% rename from src/base/i18n/time_formatting.h rename to base/i18n/time_formatting.h
diff --git a/src/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc similarity index 100% rename from src/base/i18n/time_formatting_unittest.cc rename to base/i18n/time_formatting_unittest.cc
diff --git a/src/base/i18n/timezone.cc b/base/i18n/timezone.cc similarity index 100% rename from src/base/i18n/timezone.cc rename to base/i18n/timezone.cc
diff --git a/src/base/i18n/timezone.h b/base/i18n/timezone.h similarity index 100% rename from src/base/i18n/timezone.h rename to base/i18n/timezone.h
diff --git a/src/base/i18n/timezone_unittest.cc b/base/i18n/timezone_unittest.cc similarity index 100% rename from src/base/i18n/timezone_unittest.cc rename to base/i18n/timezone_unittest.cc
diff --git a/src/base/i18n/unicodestring.h b/base/i18n/unicodestring.h similarity index 100% rename from src/base/i18n/unicodestring.h rename to base/i18n/unicodestring.h
diff --git a/src/base/i18n/utf8_validator_tables.cc b/base/i18n/utf8_validator_tables.cc similarity index 100% rename from src/base/i18n/utf8_validator_tables.cc rename to base/i18n/utf8_validator_tables.cc
diff --git a/src/base/i18n/utf8_validator_tables.h b/base/i18n/utf8_validator_tables.h similarity index 100% rename from src/base/i18n/utf8_validator_tables.h rename to base/i18n/utf8_validator_tables.h
diff --git a/src/base/ios/block_types.h b/base/ios/block_types.h similarity index 100% rename from src/base/ios/block_types.h rename to base/ios/block_types.h
diff --git a/src/base/ios/crb_protocol_observers.h b/base/ios/crb_protocol_observers.h similarity index 100% rename from src/base/ios/crb_protocol_observers.h rename to base/ios/crb_protocol_observers.h
diff --git a/src/base/ios/crb_protocol_observers.mm b/base/ios/crb_protocol_observers.mm similarity index 100% rename from src/base/ios/crb_protocol_observers.mm rename to base/ios/crb_protocol_observers.mm
diff --git a/src/base/ios/crb_protocol_observers_unittest.mm b/base/ios/crb_protocol_observers_unittest.mm similarity index 100% rename from src/base/ios/crb_protocol_observers_unittest.mm rename to base/ios/crb_protocol_observers_unittest.mm
diff --git a/src/base/ios/device_util.h b/base/ios/device_util.h similarity index 100% rename from src/base/ios/device_util.h rename to base/ios/device_util.h
diff --git a/src/base/ios/device_util.mm b/base/ios/device_util.mm similarity index 100% rename from src/base/ios/device_util.mm rename to base/ios/device_util.mm
diff --git a/src/base/ios/device_util_unittest.mm b/base/ios/device_util_unittest.mm similarity index 100% rename from src/base/ios/device_util_unittest.mm rename to base/ios/device_util_unittest.mm
diff --git a/src/base/ios/ios_util.h b/base/ios/ios_util.h similarity index 100% rename from src/base/ios/ios_util.h rename to base/ios/ios_util.h
diff --git a/src/base/ios/ios_util.mm b/base/ios/ios_util.mm similarity index 100% rename from src/base/ios/ios_util.mm rename to base/ios/ios_util.mm
diff --git a/src/base/ios/ns_error_util.h b/base/ios/ns_error_util.h similarity index 100% rename from src/base/ios/ns_error_util.h rename to base/ios/ns_error_util.h
diff --git a/src/base/ios/ns_error_util.mm b/base/ios/ns_error_util.mm similarity index 100% rename from src/base/ios/ns_error_util.mm rename to base/ios/ns_error_util.mm
diff --git a/src/base/ios/scoped_critical_action.h b/base/ios/scoped_critical_action.h similarity index 100% rename from src/base/ios/scoped_critical_action.h rename to base/ios/scoped_critical_action.h
diff --git a/src/base/ios/scoped_critical_action.mm b/base/ios/scoped_critical_action.mm similarity index 100% rename from src/base/ios/scoped_critical_action.mm rename to base/ios/scoped_critical_action.mm
diff --git a/src/base/ios/weak_nsobject.h b/base/ios/weak_nsobject.h similarity index 100% rename from src/base/ios/weak_nsobject.h rename to base/ios/weak_nsobject.h
diff --git a/src/base/ios/weak_nsobject.mm b/base/ios/weak_nsobject.mm similarity index 100% rename from src/base/ios/weak_nsobject.mm rename to base/ios/weak_nsobject.mm
diff --git a/src/base/ios/weak_nsobject_unittest.mm b/base/ios/weak_nsobject_unittest.mm similarity index 100% rename from src/base/ios/weak_nsobject_unittest.mm rename to base/ios/weak_nsobject_unittest.mm
diff --git a/src/base/json/json_correctness_fuzzer.cc b/base/json/json_correctness_fuzzer.cc similarity index 100% rename from src/base/json/json_correctness_fuzzer.cc rename to base/json/json_correctness_fuzzer.cc
diff --git a/src/base/json/json_file_value_serializer.cc b/base/json/json_file_value_serializer.cc similarity index 100% rename from src/base/json/json_file_value_serializer.cc rename to base/json/json_file_value_serializer.cc
diff --git a/src/base/json/json_file_value_serializer.h b/base/json/json_file_value_serializer.h similarity index 100% rename from src/base/json/json_file_value_serializer.h rename to base/json/json_file_value_serializer.h
diff --git a/src/base/json/json_parser.cc b/base/json/json_parser.cc similarity index 100% rename from src/base/json/json_parser.cc rename to base/json/json_parser.cc
diff --git a/src/base/json/json_parser.h b/base/json/json_parser.h similarity index 100% rename from src/base/json/json_parser.h rename to base/json/json_parser.h
diff --git a/src/base/json/json_parser_unittest.cc b/base/json/json_parser_unittest.cc similarity index 100% rename from src/base/json/json_parser_unittest.cc rename to base/json/json_parser_unittest.cc
diff --git a/src/base/json/json_perftest.cc b/base/json/json_perftest.cc similarity index 100% rename from src/base/json/json_perftest.cc rename to base/json/json_perftest.cc
diff --git a/src/base/json/json_reader.cc b/base/json/json_reader.cc similarity index 100% rename from src/base/json/json_reader.cc rename to base/json/json_reader.cc
diff --git a/src/base/json/json_reader.h b/base/json/json_reader.h similarity index 100% rename from src/base/json/json_reader.h rename to base/json/json_reader.h
diff --git a/src/base/json/json_reader_fuzzer.cc b/base/json/json_reader_fuzzer.cc similarity index 100% rename from src/base/json/json_reader_fuzzer.cc rename to base/json/json_reader_fuzzer.cc
diff --git a/src/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc similarity index 100% rename from src/base/json/json_reader_unittest.cc rename to base/json/json_reader_unittest.cc
diff --git a/src/base/json/json_string_value_serializer.cc b/base/json/json_string_value_serializer.cc similarity index 100% rename from src/base/json/json_string_value_serializer.cc rename to base/json/json_string_value_serializer.cc
diff --git a/src/base/json/json_string_value_serializer.h b/base/json/json_string_value_serializer.h similarity index 100% rename from src/base/json/json_string_value_serializer.h rename to base/json/json_string_value_serializer.h
diff --git a/src/base/json/json_value_converter.cc b/base/json/json_value_converter.cc similarity index 100% rename from src/base/json/json_value_converter.cc rename to base/json/json_value_converter.cc
diff --git a/src/base/json/json_value_converter.h b/base/json/json_value_converter.h similarity index 100% rename from src/base/json/json_value_converter.h rename to base/json/json_value_converter.h
diff --git a/src/base/json/json_value_converter_unittest.cc b/base/json/json_value_converter_unittest.cc similarity index 100% rename from src/base/json/json_value_converter_unittest.cc rename to base/json/json_value_converter_unittest.cc
diff --git a/src/base/json/json_value_serializer_unittest.cc b/base/json/json_value_serializer_unittest.cc similarity index 100% rename from src/base/json/json_value_serializer_unittest.cc rename to base/json/json_value_serializer_unittest.cc
diff --git a/src/base/json/json_writer.cc b/base/json/json_writer.cc similarity index 100% rename from src/base/json/json_writer.cc rename to base/json/json_writer.cc
diff --git a/src/base/json/json_writer.h b/base/json/json_writer.h similarity index 100% rename from src/base/json/json_writer.h rename to base/json/json_writer.h
diff --git a/src/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc similarity index 100% rename from src/base/json/json_writer_unittest.cc rename to base/json/json_writer_unittest.cc
diff --git a/src/base/json/string_escape.cc b/base/json/string_escape.cc similarity index 100% rename from src/base/json/string_escape.cc rename to base/json/string_escape.cc
diff --git a/src/base/json/string_escape.h b/base/json/string_escape.h similarity index 100% rename from src/base/json/string_escape.h rename to base/json/string_escape.h
diff --git a/src/base/json/string_escape_fuzzer.cc b/base/json/string_escape_fuzzer.cc similarity index 100% rename from src/base/json/string_escape_fuzzer.cc rename to base/json/string_escape_fuzzer.cc
diff --git a/src/base/json/string_escape_unittest.cc b/base/json/string_escape_unittest.cc similarity index 100% rename from src/base/json/string_escape_unittest.cc rename to base/json/string_escape_unittest.cc
diff --git a/src/base/lazy_instance.h b/base/lazy_instance.h similarity index 100% rename from src/base/lazy_instance.h rename to base/lazy_instance.h
diff --git a/src/base/lazy_instance_helpers.cc b/base/lazy_instance_helpers.cc similarity index 100% rename from src/base/lazy_instance_helpers.cc rename to base/lazy_instance_helpers.cc
diff --git a/src/base/lazy_instance_helpers.h b/base/lazy_instance_helpers.h similarity index 100% rename from src/base/lazy_instance_helpers.h rename to base/lazy_instance_helpers.h
diff --git a/src/base/lazy_instance_unittest.cc b/base/lazy_instance_unittest.cc similarity index 100% rename from src/base/lazy_instance_unittest.cc rename to base/lazy_instance_unittest.cc
diff --git a/src/base/linux_util.cc b/base/linux_util.cc similarity index 100% rename from src/base/linux_util.cc rename to base/linux_util.cc
diff --git a/src/base/linux_util.h b/base/linux_util.h similarity index 100% rename from src/base/linux_util.h rename to base/linux_util.h
diff --git a/src/base/location.cc b/base/location.cc similarity index 100% rename from src/base/location.cc rename to base/location.cc
diff --git a/src/base/location.h b/base/location.h similarity index 100% rename from src/base/location.h rename to base/location.h
diff --git a/src/base/log_once_unittest.cc b/base/log_once_unittest.cc similarity index 100% rename from src/base/log_once_unittest.cc rename to base/log_once_unittest.cc
diff --git a/src/base/log_once_unittest_1.h b/base/log_once_unittest_1.h similarity index 100% rename from src/base/log_once_unittest_1.h rename to base/log_once_unittest_1.h
diff --git a/src/base/log_once_unittest_2.h b/base/log_once_unittest_2.h similarity index 100% rename from src/base/log_once_unittest_2.h rename to base/log_once_unittest_2.h
diff --git a/src/base/logging.cc b/base/logging.cc similarity index 100% rename from src/base/logging.cc rename to base/logging.cc
diff --git a/src/base/logging.h b/base/logging.h similarity index 100% rename from src/base/logging.h rename to base/logging.h
diff --git a/src/base/logging_unittest.cc b/base/logging_unittest.cc similarity index 100% rename from src/base/logging_unittest.cc rename to base/logging_unittest.cc
diff --git a/src/base/logging_win.cc b/base/logging_win.cc similarity index 100% rename from src/base/logging_win.cc rename to base/logging_win.cc
diff --git a/src/base/logging_win.h b/base/logging_win.h similarity index 100% rename from src/base/logging_win.h rename to base/logging_win.h
diff --git a/src/base/mac/authorization_util.h b/base/mac/authorization_util.h similarity index 100% rename from src/base/mac/authorization_util.h rename to base/mac/authorization_util.h
diff --git a/src/base/mac/authorization_util.mm b/base/mac/authorization_util.mm similarity index 100% rename from src/base/mac/authorization_util.mm rename to base/mac/authorization_util.mm
diff --git a/src/base/mac/availability.h b/base/mac/availability.h similarity index 100% rename from src/base/mac/availability.h rename to base/mac/availability.h
diff --git a/src/base/mac/bind_objc_block_unittest.mm b/base/mac/bind_objc_block_unittest.mm similarity index 100% rename from src/base/mac/bind_objc_block_unittest.mm rename to base/mac/bind_objc_block_unittest.mm
diff --git a/src/base/mac/bind_objc_block_unittest_arc.mm b/base/mac/bind_objc_block_unittest_arc.mm similarity index 100% rename from src/base/mac/bind_objc_block_unittest_arc.mm rename to base/mac/bind_objc_block_unittest_arc.mm
diff --git a/src/base/mac/bundle_locations.h b/base/mac/bundle_locations.h similarity index 100% rename from src/base/mac/bundle_locations.h rename to base/mac/bundle_locations.h
diff --git a/src/base/mac/bundle_locations.mm b/base/mac/bundle_locations.mm similarity index 100% rename from src/base/mac/bundle_locations.mm rename to base/mac/bundle_locations.mm
diff --git a/src/base/mac/call_with_eh_frame.cc b/base/mac/call_with_eh_frame.cc similarity index 100% rename from src/base/mac/call_with_eh_frame.cc rename to base/mac/call_with_eh_frame.cc
diff --git a/src/base/mac/call_with_eh_frame.h b/base/mac/call_with_eh_frame.h similarity index 100% rename from src/base/mac/call_with_eh_frame.h rename to base/mac/call_with_eh_frame.h
diff --git a/src/base/mac/call_with_eh_frame_asm.S b/base/mac/call_with_eh_frame_asm.S similarity index 100% rename from src/base/mac/call_with_eh_frame_asm.S rename to base/mac/call_with_eh_frame_asm.S
diff --git a/src/base/mac/call_with_eh_frame_unittest.mm b/base/mac/call_with_eh_frame_unittest.mm similarity index 100% rename from src/base/mac/call_with_eh_frame_unittest.mm rename to base/mac/call_with_eh_frame_unittest.mm
diff --git a/src/base/mac/close_nocancel.cc b/base/mac/close_nocancel.cc similarity index 100% rename from src/base/mac/close_nocancel.cc rename to base/mac/close_nocancel.cc
diff --git a/src/base/mac/dispatch_source_mach.cc b/base/mac/dispatch_source_mach.cc similarity index 100% rename from src/base/mac/dispatch_source_mach.cc rename to base/mac/dispatch_source_mach.cc
diff --git a/src/base/mac/dispatch_source_mach.h b/base/mac/dispatch_source_mach.h similarity index 100% rename from src/base/mac/dispatch_source_mach.h rename to base/mac/dispatch_source_mach.h
diff --git a/src/base/mac/dispatch_source_mach_unittest.cc b/base/mac/dispatch_source_mach_unittest.cc similarity index 100% rename from src/base/mac/dispatch_source_mach_unittest.cc rename to base/mac/dispatch_source_mach_unittest.cc
diff --git a/src/base/mac/foundation_util.h b/base/mac/foundation_util.h similarity index 100% rename from src/base/mac/foundation_util.h rename to base/mac/foundation_util.h
diff --git a/src/base/mac/foundation_util.mm b/base/mac/foundation_util.mm similarity index 100% rename from src/base/mac/foundation_util.mm rename to base/mac/foundation_util.mm
diff --git a/src/base/mac/foundation_util_unittest.mm b/base/mac/foundation_util_unittest.mm similarity index 100% rename from src/base/mac/foundation_util_unittest.mm rename to base/mac/foundation_util_unittest.mm
diff --git a/src/base/mac/launch_services_util.h b/base/mac/launch_services_util.h similarity index 100% rename from src/base/mac/launch_services_util.h rename to base/mac/launch_services_util.h
diff --git a/src/base/mac/launch_services_util.mm b/base/mac/launch_services_util.mm similarity index 100% rename from src/base/mac/launch_services_util.mm rename to base/mac/launch_services_util.mm
diff --git a/src/base/mac/launchd.cc b/base/mac/launchd.cc similarity index 100% rename from src/base/mac/launchd.cc rename to base/mac/launchd.cc
diff --git a/src/base/mac/launchd.h b/base/mac/launchd.h similarity index 100% rename from src/base/mac/launchd.h rename to base/mac/launchd.h
diff --git a/src/base/mac/mac_logging.h b/base/mac/mac_logging.h similarity index 100% rename from src/base/mac/mac_logging.h rename to base/mac/mac_logging.h
diff --git a/src/base/mac/mac_logging.mm b/base/mac/mac_logging.mm similarity index 100% rename from src/base/mac/mac_logging.mm rename to base/mac/mac_logging.mm
diff --git a/src/base/mac/mac_util.h b/base/mac/mac_util.h similarity index 100% rename from src/base/mac/mac_util.h rename to base/mac/mac_util.h
diff --git a/src/base/mac/mac_util.mm b/base/mac/mac_util.mm similarity index 100% rename from src/base/mac/mac_util.mm rename to base/mac/mac_util.mm
diff --git a/src/base/mac/mac_util_unittest.mm b/base/mac/mac_util_unittest.mm similarity index 100% rename from src/base/mac/mac_util_unittest.mm rename to base/mac/mac_util_unittest.mm
diff --git a/src/base/mac/mach_logging.cc b/base/mac/mach_logging.cc similarity index 100% rename from src/base/mac/mach_logging.cc rename to base/mac/mach_logging.cc
diff --git a/src/base/mac/mach_logging.h b/base/mac/mach_logging.h similarity index 100% rename from src/base/mac/mach_logging.h rename to base/mac/mach_logging.h
diff --git a/src/base/mac/mach_port_broker.h b/base/mac/mach_port_broker.h similarity index 100% rename from src/base/mac/mach_port_broker.h rename to base/mac/mach_port_broker.h
diff --git a/src/base/mac/mach_port_broker.mm b/base/mac/mach_port_broker.mm similarity index 100% rename from src/base/mac/mach_port_broker.mm rename to base/mac/mach_port_broker.mm
diff --git a/src/base/mac/mach_port_broker_unittest.cc b/base/mac/mach_port_broker_unittest.cc similarity index 100% rename from src/base/mac/mach_port_broker_unittest.cc rename to base/mac/mach_port_broker_unittest.cc
diff --git a/src/base/mac/mach_port_util.cc b/base/mac/mach_port_util.cc similarity index 100% rename from src/base/mac/mach_port_util.cc rename to base/mac/mach_port_util.cc
diff --git a/src/base/mac/mach_port_util.h b/base/mac/mach_port_util.h similarity index 100% rename from src/base/mac/mach_port_util.h rename to base/mac/mach_port_util.h
diff --git a/src/base/mac/objc_release_properties.h b/base/mac/objc_release_properties.h similarity index 100% rename from src/base/mac/objc_release_properties.h rename to base/mac/objc_release_properties.h
diff --git a/src/base/mac/objc_release_properties.mm b/base/mac/objc_release_properties.mm similarity index 100% rename from src/base/mac/objc_release_properties.mm rename to base/mac/objc_release_properties.mm
diff --git a/src/base/mac/objc_release_properties_unittest.mm b/base/mac/objc_release_properties_unittest.mm similarity index 100% rename from src/base/mac/objc_release_properties_unittest.mm rename to base/mac/objc_release_properties_unittest.mm
diff --git a/src/base/mac/os_crash_dumps.cc b/base/mac/os_crash_dumps.cc similarity index 100% rename from src/base/mac/os_crash_dumps.cc rename to base/mac/os_crash_dumps.cc
diff --git a/src/base/mac/os_crash_dumps.h b/base/mac/os_crash_dumps.h similarity index 100% rename from src/base/mac/os_crash_dumps.h rename to base/mac/os_crash_dumps.h
diff --git a/src/base/mac/scoped_aedesc.h b/base/mac/scoped_aedesc.h similarity index 100% rename from src/base/mac/scoped_aedesc.h rename to base/mac/scoped_aedesc.h
diff --git a/src/base/mac/scoped_authorizationref.h b/base/mac/scoped_authorizationref.h similarity index 100% rename from src/base/mac/scoped_authorizationref.h rename to base/mac/scoped_authorizationref.h
diff --git a/src/base/mac/scoped_block.h b/base/mac/scoped_block.h similarity index 100% rename from src/base/mac/scoped_block.h rename to base/mac/scoped_block.h
diff --git a/src/base/mac/scoped_cffiledescriptorref.h b/base/mac/scoped_cffiledescriptorref.h similarity index 100% rename from src/base/mac/scoped_cffiledescriptorref.h rename to base/mac/scoped_cffiledescriptorref.h
diff --git a/src/base/mac/scoped_cftyperef.h b/base/mac/scoped_cftyperef.h similarity index 100% rename from src/base/mac/scoped_cftyperef.h rename to base/mac/scoped_cftyperef.h
diff --git a/src/base/mac/scoped_dispatch_object.h b/base/mac/scoped_dispatch_object.h similarity index 100% rename from src/base/mac/scoped_dispatch_object.h rename to base/mac/scoped_dispatch_object.h
diff --git a/src/base/mac/scoped_ionotificationportref.h b/base/mac/scoped_ionotificationportref.h similarity index 100% rename from src/base/mac/scoped_ionotificationportref.h rename to base/mac/scoped_ionotificationportref.h
diff --git a/src/base/mac/scoped_ioobject.h b/base/mac/scoped_ioobject.h similarity index 100% rename from src/base/mac/scoped_ioobject.h rename to base/mac/scoped_ioobject.h
diff --git a/src/base/mac/scoped_ioplugininterface.h b/base/mac/scoped_ioplugininterface.h similarity index 100% rename from src/base/mac/scoped_ioplugininterface.h rename to base/mac/scoped_ioplugininterface.h
diff --git a/src/base/mac/scoped_launch_data.h b/base/mac/scoped_launch_data.h similarity index 100% rename from src/base/mac/scoped_launch_data.h rename to base/mac/scoped_launch_data.h
diff --git a/src/base/mac/scoped_mach_port.cc b/base/mac/scoped_mach_port.cc similarity index 100% rename from src/base/mac/scoped_mach_port.cc rename to base/mac/scoped_mach_port.cc
diff --git a/src/base/mac/scoped_mach_port.h b/base/mac/scoped_mach_port.h similarity index 100% rename from src/base/mac/scoped_mach_port.h rename to base/mac/scoped_mach_port.h
diff --git a/src/base/mac/scoped_mach_vm.cc b/base/mac/scoped_mach_vm.cc similarity index 100% rename from src/base/mac/scoped_mach_vm.cc rename to base/mac/scoped_mach_vm.cc
diff --git a/src/base/mac/scoped_mach_vm.h b/base/mac/scoped_mach_vm.h similarity index 100% rename from src/base/mac/scoped_mach_vm.h rename to base/mac/scoped_mach_vm.h
diff --git a/src/base/mac/scoped_nsautorelease_pool.h b/base/mac/scoped_nsautorelease_pool.h similarity index 100% rename from src/base/mac/scoped_nsautorelease_pool.h rename to base/mac/scoped_nsautorelease_pool.h
diff --git a/src/base/mac/scoped_nsautorelease_pool.mm b/base/mac/scoped_nsautorelease_pool.mm similarity index 100% rename from src/base/mac/scoped_nsautorelease_pool.mm rename to base/mac/scoped_nsautorelease_pool.mm
diff --git a/src/base/mac/scoped_nsobject.h b/base/mac/scoped_nsobject.h similarity index 100% rename from src/base/mac/scoped_nsobject.h rename to base/mac/scoped_nsobject.h
diff --git a/src/base/mac/scoped_nsobject.mm b/base/mac/scoped_nsobject.mm similarity index 100% rename from src/base/mac/scoped_nsobject.mm rename to base/mac/scoped_nsobject.mm
diff --git a/src/base/mac/scoped_nsobject_unittest.mm b/base/mac/scoped_nsobject_unittest.mm similarity index 100% rename from src/base/mac/scoped_nsobject_unittest.mm rename to base/mac/scoped_nsobject_unittest.mm
diff --git a/src/base/mac/scoped_nsobject_unittest_arc.mm b/base/mac/scoped_nsobject_unittest_arc.mm similarity index 100% rename from src/base/mac/scoped_nsobject_unittest_arc.mm rename to base/mac/scoped_nsobject_unittest_arc.mm
diff --git a/src/base/mac/scoped_objc_class_swizzler.h b/base/mac/scoped_objc_class_swizzler.h similarity index 100% rename from src/base/mac/scoped_objc_class_swizzler.h rename to base/mac/scoped_objc_class_swizzler.h
diff --git a/src/base/mac/scoped_objc_class_swizzler.mm b/base/mac/scoped_objc_class_swizzler.mm similarity index 100% rename from src/base/mac/scoped_objc_class_swizzler.mm rename to base/mac/scoped_objc_class_swizzler.mm
diff --git a/src/base/mac/scoped_objc_class_swizzler_unittest.mm b/base/mac/scoped_objc_class_swizzler_unittest.mm similarity index 100% rename from src/base/mac/scoped_objc_class_swizzler_unittest.mm rename to base/mac/scoped_objc_class_swizzler_unittest.mm
diff --git a/src/base/mac/scoped_sending_event.h b/base/mac/scoped_sending_event.h similarity index 100% rename from src/base/mac/scoped_sending_event.h rename to base/mac/scoped_sending_event.h
diff --git a/src/base/mac/scoped_sending_event.mm b/base/mac/scoped_sending_event.mm similarity index 100% rename from src/base/mac/scoped_sending_event.mm rename to base/mac/scoped_sending_event.mm
diff --git a/src/base/mac/scoped_sending_event_unittest.mm b/base/mac/scoped_sending_event_unittest.mm similarity index 100% rename from src/base/mac/scoped_sending_event_unittest.mm rename to base/mac/scoped_sending_event_unittest.mm
diff --git a/src/base/mac/scoped_typeref.h b/base/mac/scoped_typeref.h similarity index 100% rename from src/base/mac/scoped_typeref.h rename to base/mac/scoped_typeref.h
diff --git a/src/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h similarity index 100% rename from src/base/mac/sdk_forward_declarations.h rename to base/mac/sdk_forward_declarations.h
diff --git a/src/base/mac/sdk_forward_declarations.mm b/base/mac/sdk_forward_declarations.mm similarity index 100% rename from src/base/mac/sdk_forward_declarations.mm rename to base/mac/sdk_forward_declarations.mm
diff --git a/src/base/macros.h b/base/macros.h similarity index 100% rename from src/base/macros.h rename to base/macros.h
diff --git a/src/base/md5.cc b/base/md5.cc similarity index 100% rename from src/base/md5.cc rename to base/md5.cc
diff --git a/src/base/md5.h b/base/md5.h similarity index 100% rename from src/base/md5.h rename to base/md5.h
diff --git a/src/base/md5_unittest.cc b/base/md5_unittest.cc similarity index 100% rename from src/base/md5_unittest.cc rename to base/md5_unittest.cc
diff --git a/src/base/memory/aligned_memory.cc b/base/memory/aligned_memory.cc similarity index 100% rename from src/base/memory/aligned_memory.cc rename to base/memory/aligned_memory.cc
diff --git a/src/base/memory/aligned_memory.h b/base/memory/aligned_memory.h similarity index 100% rename from src/base/memory/aligned_memory.h rename to base/memory/aligned_memory.h
diff --git a/src/base/memory/aligned_memory_unittest.cc b/base/memory/aligned_memory_unittest.cc similarity index 100% rename from src/base/memory/aligned_memory_unittest.cc rename to base/memory/aligned_memory_unittest.cc
diff --git a/src/base/memory/discardable_memory.cc b/base/memory/discardable_memory.cc similarity index 100% rename from src/base/memory/discardable_memory.cc rename to base/memory/discardable_memory.cc
diff --git a/src/base/memory/discardable_memory.h b/base/memory/discardable_memory.h similarity index 100% rename from src/base/memory/discardable_memory.h rename to base/memory/discardable_memory.h
diff --git a/src/base/memory/discardable_memory_allocator.cc b/base/memory/discardable_memory_allocator.cc similarity index 100% rename from src/base/memory/discardable_memory_allocator.cc rename to base/memory/discardable_memory_allocator.cc
diff --git a/src/base/memory/discardable_memory_allocator.h b/base/memory/discardable_memory_allocator.h similarity index 100% rename from src/base/memory/discardable_memory_allocator.h rename to base/memory/discardable_memory_allocator.h
diff --git a/src/base/memory/discardable_shared_memory.cc b/base/memory/discardable_shared_memory.cc similarity index 100% rename from src/base/memory/discardable_shared_memory.cc rename to base/memory/discardable_shared_memory.cc
diff --git a/src/base/memory/discardable_shared_memory.h b/base/memory/discardable_shared_memory.h similarity index 100% rename from src/base/memory/discardable_shared_memory.h rename to base/memory/discardable_shared_memory.h
diff --git a/src/base/memory/discardable_shared_memory_unittest.cc b/base/memory/discardable_shared_memory_unittest.cc similarity index 100% rename from src/base/memory/discardable_shared_memory_unittest.cc rename to base/memory/discardable_shared_memory_unittest.cc
diff --git a/src/base/memory/fake_memory_pressure_monitor.cc b/base/memory/fake_memory_pressure_monitor.cc similarity index 100% rename from src/base/memory/fake_memory_pressure_monitor.cc rename to base/memory/fake_memory_pressure_monitor.cc
diff --git a/src/base/memory/fake_memory_pressure_monitor.h b/base/memory/fake_memory_pressure_monitor.h similarity index 100% rename from src/base/memory/fake_memory_pressure_monitor.h rename to base/memory/fake_memory_pressure_monitor.h
diff --git a/src/base/memory/free_deleter.h b/base/memory/free_deleter.h similarity index 100% rename from src/base/memory/free_deleter.h rename to base/memory/free_deleter.h
diff --git a/src/base/memory/linked_ptr.h b/base/memory/linked_ptr.h similarity index 100% rename from src/base/memory/linked_ptr.h rename to base/memory/linked_ptr.h
diff --git a/src/base/memory/linked_ptr_unittest.cc b/base/memory/linked_ptr_unittest.cc similarity index 100% rename from src/base/memory/linked_ptr_unittest.cc rename to base/memory/linked_ptr_unittest.cc
diff --git a/src/base/memory/memory_coordinator_client.cc b/base/memory/memory_coordinator_client.cc similarity index 100% rename from src/base/memory/memory_coordinator_client.cc rename to base/memory/memory_coordinator_client.cc
diff --git a/src/base/memory/memory_coordinator_client.h b/base/memory/memory_coordinator_client.h similarity index 100% rename from src/base/memory/memory_coordinator_client.h rename to base/memory/memory_coordinator_client.h
diff --git a/src/base/memory/memory_coordinator_client_registry.cc b/base/memory/memory_coordinator_client_registry.cc similarity index 100% rename from src/base/memory/memory_coordinator_client_registry.cc rename to base/memory/memory_coordinator_client_registry.cc
diff --git a/src/base/memory/memory_coordinator_client_registry.h b/base/memory/memory_coordinator_client_registry.h similarity index 100% rename from src/base/memory/memory_coordinator_client_registry.h rename to base/memory/memory_coordinator_client_registry.h
diff --git a/src/base/memory/memory_coordinator_client_registry_unittest.cc b/base/memory/memory_coordinator_client_registry_unittest.cc similarity index 100% rename from src/base/memory/memory_coordinator_client_registry_unittest.cc rename to base/memory/memory_coordinator_client_registry_unittest.cc
diff --git a/src/base/memory/memory_coordinator_proxy.cc b/base/memory/memory_coordinator_proxy.cc similarity index 100% rename from src/base/memory/memory_coordinator_proxy.cc rename to base/memory/memory_coordinator_proxy.cc
diff --git a/src/base/memory/memory_coordinator_proxy.h b/base/memory/memory_coordinator_proxy.h similarity index 100% rename from src/base/memory/memory_coordinator_proxy.h rename to base/memory/memory_coordinator_proxy.h
diff --git a/src/base/memory/memory_pressure_listener.cc b/base/memory/memory_pressure_listener.cc similarity index 100% rename from src/base/memory/memory_pressure_listener.cc rename to base/memory/memory_pressure_listener.cc
diff --git a/src/base/memory/memory_pressure_listener.h b/base/memory/memory_pressure_listener.h similarity index 100% rename from src/base/memory/memory_pressure_listener.h rename to base/memory/memory_pressure_listener.h
diff --git a/src/base/memory/memory_pressure_listener_unittest.cc b/base/memory/memory_pressure_listener_unittest.cc similarity index 100% rename from src/base/memory/memory_pressure_listener_unittest.cc rename to base/memory/memory_pressure_listener_unittest.cc
diff --git a/src/base/memory/memory_pressure_monitor.cc b/base/memory/memory_pressure_monitor.cc similarity index 100% rename from src/base/memory/memory_pressure_monitor.cc rename to base/memory/memory_pressure_monitor.cc
diff --git a/src/base/memory/memory_pressure_monitor.h b/base/memory/memory_pressure_monitor.h similarity index 100% rename from src/base/memory/memory_pressure_monitor.h rename to base/memory/memory_pressure_monitor.h
diff --git a/src/base/memory/memory_pressure_monitor_chromeos.cc b/base/memory/memory_pressure_monitor_chromeos.cc similarity index 100% rename from src/base/memory/memory_pressure_monitor_chromeos.cc rename to base/memory/memory_pressure_monitor_chromeos.cc
diff --git a/src/base/memory/memory_pressure_monitor_chromeos.h b/base/memory/memory_pressure_monitor_chromeos.h similarity index 100% rename from src/base/memory/memory_pressure_monitor_chromeos.h rename to base/memory/memory_pressure_monitor_chromeos.h
diff --git a/src/base/memory/memory_pressure_monitor_chromeos_unittest.cc b/base/memory/memory_pressure_monitor_chromeos_unittest.cc similarity index 100% rename from src/base/memory/memory_pressure_monitor_chromeos_unittest.cc rename to base/memory/memory_pressure_monitor_chromeos_unittest.cc
diff --git a/src/base/memory/memory_pressure_monitor_mac.cc b/base/memory/memory_pressure_monitor_mac.cc similarity index 100% rename from src/base/memory/memory_pressure_monitor_mac.cc rename to base/memory/memory_pressure_monitor_mac.cc
diff --git a/src/base/memory/memory_pressure_monitor_mac.h b/base/memory/memory_pressure_monitor_mac.h similarity index 100% rename from src/base/memory/memory_pressure_monitor_mac.h rename to base/memory/memory_pressure_monitor_mac.h
diff --git a/src/base/memory/memory_pressure_monitor_mac_unittest.cc b/base/memory/memory_pressure_monitor_mac_unittest.cc similarity index 100% rename from src/base/memory/memory_pressure_monitor_mac_unittest.cc rename to base/memory/memory_pressure_monitor_mac_unittest.cc
diff --git a/src/base/memory/memory_pressure_monitor_unittest.cc b/base/memory/memory_pressure_monitor_unittest.cc similarity index 100% rename from src/base/memory/memory_pressure_monitor_unittest.cc rename to base/memory/memory_pressure_monitor_unittest.cc
diff --git a/src/base/memory/memory_pressure_monitor_win.cc b/base/memory/memory_pressure_monitor_win.cc similarity index 100% rename from src/base/memory/memory_pressure_monitor_win.cc rename to base/memory/memory_pressure_monitor_win.cc
diff --git a/src/base/memory/memory_pressure_monitor_win.h b/base/memory/memory_pressure_monitor_win.h similarity index 100% rename from src/base/memory/memory_pressure_monitor_win.h rename to base/memory/memory_pressure_monitor_win.h
diff --git a/src/base/memory/memory_pressure_monitor_win_unittest.cc b/base/memory/memory_pressure_monitor_win_unittest.cc similarity index 100% rename from src/base/memory/memory_pressure_monitor_win_unittest.cc rename to base/memory/memory_pressure_monitor_win_unittest.cc
diff --git a/src/base/memory/platform_shared_memory_region.cc b/base/memory/platform_shared_memory_region.cc similarity index 100% rename from src/base/memory/platform_shared_memory_region.cc rename to base/memory/platform_shared_memory_region.cc
diff --git a/src/base/memory/platform_shared_memory_region.h b/base/memory/platform_shared_memory_region.h similarity index 100% rename from src/base/memory/platform_shared_memory_region.h rename to base/memory/platform_shared_memory_region.h
diff --git a/src/base/memory/platform_shared_memory_region_android.cc b/base/memory/platform_shared_memory_region_android.cc similarity index 100% rename from src/base/memory/platform_shared_memory_region_android.cc rename to base/memory/platform_shared_memory_region_android.cc
diff --git a/src/base/memory/platform_shared_memory_region_fuchsia.cc b/base/memory/platform_shared_memory_region_fuchsia.cc similarity index 100% rename from src/base/memory/platform_shared_memory_region_fuchsia.cc rename to base/memory/platform_shared_memory_region_fuchsia.cc
diff --git a/src/base/memory/platform_shared_memory_region_mac.cc b/base/memory/platform_shared_memory_region_mac.cc similarity index 100% rename from src/base/memory/platform_shared_memory_region_mac.cc rename to base/memory/platform_shared_memory_region_mac.cc
diff --git a/src/base/memory/platform_shared_memory_region_posix.cc b/base/memory/platform_shared_memory_region_posix.cc similarity index 100% rename from src/base/memory/platform_shared_memory_region_posix.cc rename to base/memory/platform_shared_memory_region_posix.cc
diff --git a/src/base/memory/platform_shared_memory_region_unittest.cc b/base/memory/platform_shared_memory_region_unittest.cc similarity index 100% rename from src/base/memory/platform_shared_memory_region_unittest.cc rename to base/memory/platform_shared_memory_region_unittest.cc
diff --git a/src/base/memory/platform_shared_memory_region_win.cc b/base/memory/platform_shared_memory_region_win.cc similarity index 100% rename from src/base/memory/platform_shared_memory_region_win.cc rename to base/memory/platform_shared_memory_region_win.cc
diff --git a/src/base/memory/protected_memory.cc b/base/memory/protected_memory.cc similarity index 100% rename from src/base/memory/protected_memory.cc rename to base/memory/protected_memory.cc
diff --git a/src/base/memory/protected_memory.h b/base/memory/protected_memory.h similarity index 100% rename from src/base/memory/protected_memory.h rename to base/memory/protected_memory.h
diff --git a/src/base/memory/protected_memory_cfi.h b/base/memory/protected_memory_cfi.h similarity index 100% rename from src/base/memory/protected_memory_cfi.h rename to base/memory/protected_memory_cfi.h
diff --git a/src/base/memory/protected_memory_posix.cc b/base/memory/protected_memory_posix.cc similarity index 100% rename from src/base/memory/protected_memory_posix.cc rename to base/memory/protected_memory_posix.cc
diff --git a/src/base/memory/protected_memory_unittest.cc b/base/memory/protected_memory_unittest.cc similarity index 100% rename from src/base/memory/protected_memory_unittest.cc rename to base/memory/protected_memory_unittest.cc
diff --git a/src/base/memory/protected_memory_win.cc b/base/memory/protected_memory_win.cc similarity index 100% rename from src/base/memory/protected_memory_win.cc rename to base/memory/protected_memory_win.cc
diff --git a/src/base/memory/ptr_util.h b/base/memory/ptr_util.h similarity index 100% rename from src/base/memory/ptr_util.h rename to base/memory/ptr_util.h
diff --git a/src/base/memory/ptr_util_unittest.cc b/base/memory/ptr_util_unittest.cc similarity index 100% rename from src/base/memory/ptr_util_unittest.cc rename to base/memory/ptr_util_unittest.cc
diff --git a/src/base/memory/raw_scoped_refptr_mismatch_checker.h b/base/memory/raw_scoped_refptr_mismatch_checker.h similarity index 100% rename from src/base/memory/raw_scoped_refptr_mismatch_checker.h rename to base/memory/raw_scoped_refptr_mismatch_checker.h
diff --git a/src/base/memory/read_only_shared_memory_region.cc b/base/memory/read_only_shared_memory_region.cc similarity index 100% rename from src/base/memory/read_only_shared_memory_region.cc rename to base/memory/read_only_shared_memory_region.cc
diff --git a/src/base/memory/read_only_shared_memory_region.h b/base/memory/read_only_shared_memory_region.h similarity index 100% rename from src/base/memory/read_only_shared_memory_region.h rename to base/memory/read_only_shared_memory_region.h
diff --git a/src/base/memory/ref_counted.cc b/base/memory/ref_counted.cc similarity index 100% rename from src/base/memory/ref_counted.cc rename to base/memory/ref_counted.cc
diff --git a/src/base/memory/ref_counted.h b/base/memory/ref_counted.h similarity index 100% rename from src/base/memory/ref_counted.h rename to base/memory/ref_counted.h
diff --git a/src/base/memory/ref_counted_delete_on_sequence.h b/base/memory/ref_counted_delete_on_sequence.h similarity index 100% rename from src/base/memory/ref_counted_delete_on_sequence.h rename to base/memory/ref_counted_delete_on_sequence.h
diff --git a/src/base/memory/ref_counted_memory.cc b/base/memory/ref_counted_memory.cc similarity index 100% rename from src/base/memory/ref_counted_memory.cc rename to base/memory/ref_counted_memory.cc
diff --git a/src/base/memory/ref_counted_memory.h b/base/memory/ref_counted_memory.h similarity index 100% rename from src/base/memory/ref_counted_memory.h rename to base/memory/ref_counted_memory.h
diff --git a/src/base/memory/ref_counted_memory_unittest.cc b/base/memory/ref_counted_memory_unittest.cc similarity index 100% rename from src/base/memory/ref_counted_memory_unittest.cc rename to base/memory/ref_counted_memory_unittest.cc
diff --git a/src/base/memory/ref_counted_unittest.cc b/base/memory/ref_counted_unittest.cc similarity index 100% rename from src/base/memory/ref_counted_unittest.cc rename to base/memory/ref_counted_unittest.cc
diff --git a/src/base/memory/ref_counted_unittest.nc b/base/memory/ref_counted_unittest.nc similarity index 100% rename from src/base/memory/ref_counted_unittest.nc rename to base/memory/ref_counted_unittest.nc
diff --git a/src/base/memory/scoped_policy.h b/base/memory/scoped_policy.h similarity index 100% rename from src/base/memory/scoped_policy.h rename to base/memory/scoped_policy.h
diff --git a/src/base/memory/scoped_refptr.h b/base/memory/scoped_refptr.h similarity index 100% rename from src/base/memory/scoped_refptr.h rename to base/memory/scoped_refptr.h
diff --git a/src/base/memory/shared_memory.h b/base/memory/shared_memory.h similarity index 100% rename from src/base/memory/shared_memory.h rename to base/memory/shared_memory.h
diff --git a/src/base/memory/shared_memory_android.cc b/base/memory/shared_memory_android.cc similarity index 100% rename from src/base/memory/shared_memory_android.cc rename to base/memory/shared_memory_android.cc
diff --git a/src/base/memory/shared_memory_fuchsia.cc b/base/memory/shared_memory_fuchsia.cc similarity index 100% rename from src/base/memory/shared_memory_fuchsia.cc rename to base/memory/shared_memory_fuchsia.cc
diff --git a/src/base/memory/shared_memory_handle.cc b/base/memory/shared_memory_handle.cc similarity index 100% rename from src/base/memory/shared_memory_handle.cc rename to base/memory/shared_memory_handle.cc
diff --git a/src/base/memory/shared_memory_handle.h b/base/memory/shared_memory_handle.h similarity index 100% rename from src/base/memory/shared_memory_handle.h rename to base/memory/shared_memory_handle.h
diff --git a/src/base/memory/shared_memory_handle_android.cc b/base/memory/shared_memory_handle_android.cc similarity index 100% rename from src/base/memory/shared_memory_handle_android.cc rename to base/memory/shared_memory_handle_android.cc
diff --git a/src/base/memory/shared_memory_handle_fuchsia.cc b/base/memory/shared_memory_handle_fuchsia.cc similarity index 100% rename from src/base/memory/shared_memory_handle_fuchsia.cc rename to base/memory/shared_memory_handle_fuchsia.cc
diff --git a/src/base/memory/shared_memory_handle_mac.cc b/base/memory/shared_memory_handle_mac.cc similarity index 100% rename from src/base/memory/shared_memory_handle_mac.cc rename to base/memory/shared_memory_handle_mac.cc
diff --git a/src/base/memory/shared_memory_handle_posix.cc b/base/memory/shared_memory_handle_posix.cc similarity index 100% rename from src/base/memory/shared_memory_handle_posix.cc rename to base/memory/shared_memory_handle_posix.cc
diff --git a/src/base/memory/shared_memory_handle_win.cc b/base/memory/shared_memory_handle_win.cc similarity index 100% rename from src/base/memory/shared_memory_handle_win.cc rename to base/memory/shared_memory_handle_win.cc
diff --git a/src/base/memory/shared_memory_helper.cc b/base/memory/shared_memory_helper.cc similarity index 100% rename from src/base/memory/shared_memory_helper.cc rename to base/memory/shared_memory_helper.cc
diff --git a/src/base/memory/shared_memory_helper.h b/base/memory/shared_memory_helper.h similarity index 100% rename from src/base/memory/shared_memory_helper.h rename to base/memory/shared_memory_helper.h
diff --git a/src/base/memory/shared_memory_mac.cc b/base/memory/shared_memory_mac.cc similarity index 100% rename from src/base/memory/shared_memory_mac.cc rename to base/memory/shared_memory_mac.cc
diff --git a/src/base/memory/shared_memory_mac_unittest.cc b/base/memory/shared_memory_mac_unittest.cc similarity index 100% rename from src/base/memory/shared_memory_mac_unittest.cc rename to base/memory/shared_memory_mac_unittest.cc
diff --git a/src/base/memory/shared_memory_mapping.cc b/base/memory/shared_memory_mapping.cc similarity index 100% rename from src/base/memory/shared_memory_mapping.cc rename to base/memory/shared_memory_mapping.cc
diff --git a/src/base/memory/shared_memory_mapping.h b/base/memory/shared_memory_mapping.h similarity index 100% rename from src/base/memory/shared_memory_mapping.h rename to base/memory/shared_memory_mapping.h
diff --git a/src/base/memory/shared_memory_mapping_unittest.cc b/base/memory/shared_memory_mapping_unittest.cc similarity index 100% rename from src/base/memory/shared_memory_mapping_unittest.cc rename to base/memory/shared_memory_mapping_unittest.cc
diff --git a/src/base/memory/shared_memory_nacl.cc b/base/memory/shared_memory_nacl.cc similarity index 100% rename from src/base/memory/shared_memory_nacl.cc rename to base/memory/shared_memory_nacl.cc
diff --git a/src/base/memory/shared_memory_posix.cc b/base/memory/shared_memory_posix.cc similarity index 100% rename from src/base/memory/shared_memory_posix.cc rename to base/memory/shared_memory_posix.cc
diff --git a/src/base/memory/shared_memory_region_unittest.cc b/base/memory/shared_memory_region_unittest.cc similarity index 100% rename from src/base/memory/shared_memory_region_unittest.cc rename to base/memory/shared_memory_region_unittest.cc
diff --git a/src/base/memory/shared_memory_tracker.cc b/base/memory/shared_memory_tracker.cc similarity index 100% rename from src/base/memory/shared_memory_tracker.cc rename to base/memory/shared_memory_tracker.cc
diff --git a/src/base/memory/shared_memory_tracker.h b/base/memory/shared_memory_tracker.h similarity index 100% rename from src/base/memory/shared_memory_tracker.h rename to base/memory/shared_memory_tracker.h
diff --git a/src/base/memory/shared_memory_unittest.cc b/base/memory/shared_memory_unittest.cc similarity index 100% rename from src/base/memory/shared_memory_unittest.cc rename to base/memory/shared_memory_unittest.cc
diff --git a/src/base/memory/shared_memory_win.cc b/base/memory/shared_memory_win.cc similarity index 100% rename from src/base/memory/shared_memory_win.cc rename to base/memory/shared_memory_win.cc
diff --git a/src/base/memory/shared_memory_win_unittest.cc b/base/memory/shared_memory_win_unittest.cc similarity index 100% rename from src/base/memory/shared_memory_win_unittest.cc rename to base/memory/shared_memory_win_unittest.cc
diff --git a/src/base/memory/singleton.h b/base/memory/singleton.h similarity index 100% rename from src/base/memory/singleton.h rename to base/memory/singleton.h
diff --git a/src/base/memory/singleton_unittest.cc b/base/memory/singleton_unittest.cc similarity index 100% rename from src/base/memory/singleton_unittest.cc rename to base/memory/singleton_unittest.cc
diff --git a/src/base/memory/unsafe_shared_memory_region.cc b/base/memory/unsafe_shared_memory_region.cc similarity index 100% rename from src/base/memory/unsafe_shared_memory_region.cc rename to base/memory/unsafe_shared_memory_region.cc
diff --git a/src/base/memory/unsafe_shared_memory_region.h b/base/memory/unsafe_shared_memory_region.h similarity index 100% rename from src/base/memory/unsafe_shared_memory_region.h rename to base/memory/unsafe_shared_memory_region.h
diff --git a/src/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc similarity index 100% rename from src/base/memory/weak_ptr.cc rename to base/memory/weak_ptr.cc
diff --git a/src/base/memory/weak_ptr.h b/base/memory/weak_ptr.h similarity index 100% rename from src/base/memory/weak_ptr.h rename to base/memory/weak_ptr.h
diff --git a/src/base/memory/weak_ptr_unittest.cc b/base/memory/weak_ptr_unittest.cc similarity index 100% rename from src/base/memory/weak_ptr_unittest.cc rename to base/memory/weak_ptr_unittest.cc
diff --git a/src/base/memory/weak_ptr_unittest.nc b/base/memory/weak_ptr_unittest.nc similarity index 100% rename from src/base/memory/weak_ptr_unittest.nc rename to base/memory/weak_ptr_unittest.nc
diff --git a/src/base/memory/writable_shared_memory_region.cc b/base/memory/writable_shared_memory_region.cc similarity index 100% rename from src/base/memory/writable_shared_memory_region.cc rename to base/memory/writable_shared_memory_region.cc
diff --git a/src/base/memory/writable_shared_memory_region.h b/base/memory/writable_shared_memory_region.h similarity index 100% rename from src/base/memory/writable_shared_memory_region.h rename to base/memory/writable_shared_memory_region.h
diff --git a/src/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc similarity index 100% rename from src/base/message_loop/message_loop.cc rename to base/message_loop/message_loop.cc
diff --git a/src/base/message_loop/message_loop.h b/base/message_loop/message_loop.h similarity index 100% rename from src/base/message_loop/message_loop.h rename to base/message_loop/message_loop.h
diff --git a/src/base/message_loop/message_loop_current.cc b/base/message_loop/message_loop_current.cc similarity index 100% rename from src/base/message_loop/message_loop_current.cc rename to base/message_loop/message_loop_current.cc
diff --git a/src/base/message_loop/message_loop_current.h b/base/message_loop/message_loop_current.h similarity index 100% rename from src/base/message_loop/message_loop_current.h rename to base/message_loop/message_loop_current.h
diff --git a/src/base/message_loop/message_loop_io_posix_unittest.cc b/base/message_loop/message_loop_io_posix_unittest.cc similarity index 100% rename from src/base/message_loop/message_loop_io_posix_unittest.cc rename to base/message_loop/message_loop_io_posix_unittest.cc
diff --git a/src/base/message_loop/message_loop_perftest.cc b/base/message_loop/message_loop_perftest.cc similarity index 100% rename from src/base/message_loop/message_loop_perftest.cc rename to base/message_loop/message_loop_perftest.cc
diff --git a/src/base/message_loop/message_loop_task_runner.cc b/base/message_loop/message_loop_task_runner.cc similarity index 100% rename from src/base/message_loop/message_loop_task_runner.cc rename to base/message_loop/message_loop_task_runner.cc
diff --git a/src/base/message_loop/message_loop_task_runner.h b/base/message_loop/message_loop_task_runner.h similarity index 100% rename from src/base/message_loop/message_loop_task_runner.h rename to base/message_loop/message_loop_task_runner.h
diff --git a/src/base/message_loop/message_loop_task_runner_perftest.cc b/base/message_loop/message_loop_task_runner_perftest.cc similarity index 100% rename from src/base/message_loop/message_loop_task_runner_perftest.cc rename to base/message_loop/message_loop_task_runner_perftest.cc
diff --git a/src/base/message_loop/message_loop_task_runner_unittest.cc b/base/message_loop/message_loop_task_runner_unittest.cc similarity index 100% rename from src/base/message_loop/message_loop_task_runner_unittest.cc rename to base/message_loop/message_loop_task_runner_unittest.cc
diff --git a/src/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc similarity index 100% rename from src/base/message_loop/message_loop_unittest.cc rename to base/message_loop/message_loop_unittest.cc
diff --git a/src/base/message_loop/message_pump.cc b/base/message_loop/message_pump.cc similarity index 100% rename from src/base/message_loop/message_pump.cc rename to base/message_loop/message_pump.cc
diff --git a/src/base/message_loop/message_pump.h b/base/message_loop/message_pump.h similarity index 100% rename from src/base/message_loop/message_pump.h rename to base/message_loop/message_pump.h
diff --git a/src/base/message_loop/message_pump_android.cc b/base/message_loop/message_pump_android.cc similarity index 100% rename from src/base/message_loop/message_pump_android.cc rename to base/message_loop/message_pump_android.cc
diff --git a/src/base/message_loop/message_pump_android.h b/base/message_loop/message_pump_android.h similarity index 100% rename from src/base/message_loop/message_pump_android.h rename to base/message_loop/message_pump_android.h
diff --git a/src/base/message_loop/message_pump_default.cc b/base/message_loop/message_pump_default.cc similarity index 100% rename from src/base/message_loop/message_pump_default.cc rename to base/message_loop/message_pump_default.cc
diff --git a/src/base/message_loop/message_pump_default.h b/base/message_loop/message_pump_default.h similarity index 100% rename from src/base/message_loop/message_pump_default.h rename to base/message_loop/message_pump_default.h
diff --git a/src/base/message_loop/message_pump_for_io.h b/base/message_loop/message_pump_for_io.h similarity index 100% rename from src/base/message_loop/message_pump_for_io.h rename to base/message_loop/message_pump_for_io.h
diff --git a/src/base/message_loop/message_pump_for_ui.h b/base/message_loop/message_pump_for_ui.h similarity index 100% rename from src/base/message_loop/message_pump_for_ui.h rename to base/message_loop/message_pump_for_ui.h
diff --git a/src/base/message_loop/message_pump_fuchsia.cc b/base/message_loop/message_pump_fuchsia.cc similarity index 100% rename from src/base/message_loop/message_pump_fuchsia.cc rename to base/message_loop/message_pump_fuchsia.cc
diff --git a/src/base/message_loop/message_pump_fuchsia.h b/base/message_loop/message_pump_fuchsia.h similarity index 100% rename from src/base/message_loop/message_pump_fuchsia.h rename to base/message_loop/message_pump_fuchsia.h
diff --git a/src/base/message_loop/message_pump_glib.cc b/base/message_loop/message_pump_glib.cc similarity index 100% rename from src/base/message_loop/message_pump_glib.cc rename to base/message_loop/message_pump_glib.cc
diff --git a/src/base/message_loop/message_pump_glib.h b/base/message_loop/message_pump_glib.h similarity index 100% rename from src/base/message_loop/message_pump_glib.h rename to base/message_loop/message_pump_glib.h
diff --git a/src/base/message_loop/message_pump_glib_unittest.cc b/base/message_loop/message_pump_glib_unittest.cc similarity index 100% rename from src/base/message_loop/message_pump_glib_unittest.cc rename to base/message_loop/message_pump_glib_unittest.cc
diff --git a/src/base/message_loop/message_pump_io_ios.cc b/base/message_loop/message_pump_io_ios.cc similarity index 100% rename from src/base/message_loop/message_pump_io_ios.cc rename to base/message_loop/message_pump_io_ios.cc
diff --git a/src/base/message_loop/message_pump_io_ios.h b/base/message_loop/message_pump_io_ios.h similarity index 100% rename from src/base/message_loop/message_pump_io_ios.h rename to base/message_loop/message_pump_io_ios.h
diff --git a/src/base/message_loop/message_pump_io_ios_unittest.cc b/base/message_loop/message_pump_io_ios_unittest.cc similarity index 100% rename from src/base/message_loop/message_pump_io_ios_unittest.cc rename to base/message_loop/message_pump_io_ios_unittest.cc
diff --git a/src/base/message_loop/message_pump_io_starboard.cc b/base/message_loop/message_pump_io_starboard.cc similarity index 100% rename from src/base/message_loop/message_pump_io_starboard.cc rename to base/message_loop/message_pump_io_starboard.cc
diff --git a/src/base/message_loop/message_pump_io_starboard.h b/base/message_loop/message_pump_io_starboard.h similarity index 100% rename from src/base/message_loop/message_pump_io_starboard.h rename to base/message_loop/message_pump_io_starboard.h
diff --git a/src/base/message_loop/message_pump_libevent.cc b/base/message_loop/message_pump_libevent.cc similarity index 100% rename from src/base/message_loop/message_pump_libevent.cc rename to base/message_loop/message_pump_libevent.cc
diff --git a/src/base/message_loop/message_pump_libevent.h b/base/message_loop/message_pump_libevent.h similarity index 100% rename from src/base/message_loop/message_pump_libevent.h rename to base/message_loop/message_pump_libevent.h
diff --git a/src/base/message_loop/message_pump_libevent_unittest.cc b/base/message_loop/message_pump_libevent_unittest.cc similarity index 100% rename from src/base/message_loop/message_pump_libevent_unittest.cc rename to base/message_loop/message_pump_libevent_unittest.cc
diff --git a/src/base/message_loop/message_pump_mac.h b/base/message_loop/message_pump_mac.h similarity index 100% rename from src/base/message_loop/message_pump_mac.h rename to base/message_loop/message_pump_mac.h
diff --git a/src/base/message_loop/message_pump_mac.mm b/base/message_loop/message_pump_mac.mm similarity index 100% rename from src/base/message_loop/message_pump_mac.mm rename to base/message_loop/message_pump_mac.mm
diff --git a/src/base/message_loop/message_pump_mac_unittest.mm b/base/message_loop/message_pump_mac_unittest.mm similarity index 100% rename from src/base/message_loop/message_pump_mac_unittest.mm rename to base/message_loop/message_pump_mac_unittest.mm
diff --git a/src/base/message_loop/message_pump_perftest.cc b/base/message_loop/message_pump_perftest.cc similarity index 100% rename from src/base/message_loop/message_pump_perftest.cc rename to base/message_loop/message_pump_perftest.cc
diff --git a/src/base/message_loop/message_pump_ui_starboard.cc b/base/message_loop/message_pump_ui_starboard.cc similarity index 100% rename from src/base/message_loop/message_pump_ui_starboard.cc rename to base/message_loop/message_pump_ui_starboard.cc
diff --git a/src/base/message_loop/message_pump_ui_starboard.h b/base/message_loop/message_pump_ui_starboard.h similarity index 100% rename from src/base/message_loop/message_pump_ui_starboard.h rename to base/message_loop/message_pump_ui_starboard.h
diff --git a/src/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc similarity index 100% rename from src/base/message_loop/message_pump_win.cc rename to base/message_loop/message_pump_win.cc
diff --git a/src/base/message_loop/message_pump_win.h b/base/message_loop/message_pump_win.h similarity index 100% rename from src/base/message_loop/message_pump_win.h rename to base/message_loop/message_pump_win.h
diff --git a/src/base/message_loop/pending_task_queue.cc b/base/message_loop/pending_task_queue.cc similarity index 100% rename from src/base/message_loop/pending_task_queue.cc rename to base/message_loop/pending_task_queue.cc
diff --git a/src/base/message_loop/pending_task_queue.h b/base/message_loop/pending_task_queue.h similarity index 100% rename from src/base/message_loop/pending_task_queue.h rename to base/message_loop/pending_task_queue.h
diff --git a/src/base/message_loop/sequenced_task_source.h b/base/message_loop/sequenced_task_source.h similarity index 100% rename from src/base/message_loop/sequenced_task_source.h rename to base/message_loop/sequenced_task_source.h
diff --git a/src/base/message_loop/timer_slack.h b/base/message_loop/timer_slack.h similarity index 100% rename from src/base/message_loop/timer_slack.h rename to base/message_loop/timer_slack.h
diff --git a/src/base/message_loop/watchable_io_message_pump_posix.cc b/base/message_loop/watchable_io_message_pump_posix.cc similarity index 100% rename from src/base/message_loop/watchable_io_message_pump_posix.cc rename to base/message_loop/watchable_io_message_pump_posix.cc
diff --git a/src/base/message_loop/watchable_io_message_pump_posix.h b/base/message_loop/watchable_io_message_pump_posix.h similarity index 100% rename from src/base/message_loop/watchable_io_message_pump_posix.h rename to base/message_loop/watchable_io_message_pump_posix.h
diff --git a/src/base/metrics/bucket_ranges.cc b/base/metrics/bucket_ranges.cc similarity index 100% rename from src/base/metrics/bucket_ranges.cc rename to base/metrics/bucket_ranges.cc
diff --git a/src/base/metrics/bucket_ranges.h b/base/metrics/bucket_ranges.h similarity index 100% rename from src/base/metrics/bucket_ranges.h rename to base/metrics/bucket_ranges.h
diff --git a/src/base/metrics/bucket_ranges_unittest.cc b/base/metrics/bucket_ranges_unittest.cc similarity index 100% rename from src/base/metrics/bucket_ranges_unittest.cc rename to base/metrics/bucket_ranges_unittest.cc
diff --git a/src/base/metrics/dummy_histogram.cc b/base/metrics/dummy_histogram.cc similarity index 100% rename from src/base/metrics/dummy_histogram.cc rename to base/metrics/dummy_histogram.cc
diff --git a/src/base/metrics/dummy_histogram.h b/base/metrics/dummy_histogram.h similarity index 100% rename from src/base/metrics/dummy_histogram.h rename to base/metrics/dummy_histogram.h
diff --git a/src/base/metrics/field_trial.cc b/base/metrics/field_trial.cc similarity index 100% rename from src/base/metrics/field_trial.cc rename to base/metrics/field_trial.cc
diff --git a/src/base/metrics/field_trial.h b/base/metrics/field_trial.h similarity index 100% rename from src/base/metrics/field_trial.h rename to base/metrics/field_trial.h
diff --git a/src/base/metrics/field_trial_param_associator.cc b/base/metrics/field_trial_param_associator.cc similarity index 100% rename from src/base/metrics/field_trial_param_associator.cc rename to base/metrics/field_trial_param_associator.cc
diff --git a/src/base/metrics/field_trial_param_associator.h b/base/metrics/field_trial_param_associator.h similarity index 100% rename from src/base/metrics/field_trial_param_associator.h rename to base/metrics/field_trial_param_associator.h
diff --git a/src/base/metrics/field_trial_params.cc b/base/metrics/field_trial_params.cc similarity index 100% rename from src/base/metrics/field_trial_params.cc rename to base/metrics/field_trial_params.cc
diff --git a/src/base/metrics/field_trial_params.h b/base/metrics/field_trial_params.h similarity index 100% rename from src/base/metrics/field_trial_params.h rename to base/metrics/field_trial_params.h
diff --git a/src/base/metrics/field_trial_params_unittest.cc b/base/metrics/field_trial_params_unittest.cc similarity index 100% rename from src/base/metrics/field_trial_params_unittest.cc rename to base/metrics/field_trial_params_unittest.cc
diff --git a/src/base/metrics/field_trial_params_unittest.nc b/base/metrics/field_trial_params_unittest.nc similarity index 100% rename from src/base/metrics/field_trial_params_unittest.nc rename to base/metrics/field_trial_params_unittest.nc
diff --git a/src/base/metrics/field_trial_unittest.cc b/base/metrics/field_trial_unittest.cc similarity index 100% rename from src/base/metrics/field_trial_unittest.cc rename to base/metrics/field_trial_unittest.cc
diff --git a/src/base/metrics/histogram.cc b/base/metrics/histogram.cc similarity index 100% rename from src/base/metrics/histogram.cc rename to base/metrics/histogram.cc
diff --git a/src/base/metrics/histogram.h b/base/metrics/histogram.h similarity index 100% rename from src/base/metrics/histogram.h rename to base/metrics/histogram.h
diff --git a/src/base/metrics/histogram_base.cc b/base/metrics/histogram_base.cc similarity index 100% rename from src/base/metrics/histogram_base.cc rename to base/metrics/histogram_base.cc
diff --git a/src/base/metrics/histogram_base.h b/base/metrics/histogram_base.h similarity index 100% rename from src/base/metrics/histogram_base.h rename to base/metrics/histogram_base.h
diff --git a/src/base/metrics/histogram_base_unittest.cc b/base/metrics/histogram_base_unittest.cc similarity index 100% rename from src/base/metrics/histogram_base_unittest.cc rename to base/metrics/histogram_base_unittest.cc
diff --git a/src/base/metrics/histogram_delta_serialization.cc b/base/metrics/histogram_delta_serialization.cc similarity index 100% rename from src/base/metrics/histogram_delta_serialization.cc rename to base/metrics/histogram_delta_serialization.cc
diff --git a/src/base/metrics/histogram_delta_serialization.h b/base/metrics/histogram_delta_serialization.h similarity index 100% rename from src/base/metrics/histogram_delta_serialization.h rename to base/metrics/histogram_delta_serialization.h
diff --git a/src/base/metrics/histogram_delta_serialization_unittest.cc b/base/metrics/histogram_delta_serialization_unittest.cc similarity index 100% rename from src/base/metrics/histogram_delta_serialization_unittest.cc rename to base/metrics/histogram_delta_serialization_unittest.cc
diff --git a/src/base/metrics/histogram_flattener.h b/base/metrics/histogram_flattener.h similarity index 100% rename from src/base/metrics/histogram_flattener.h rename to base/metrics/histogram_flattener.h
diff --git a/src/base/metrics/histogram_functions.cc b/base/metrics/histogram_functions.cc similarity index 100% rename from src/base/metrics/histogram_functions.cc rename to base/metrics/histogram_functions.cc
diff --git a/src/base/metrics/histogram_functions.h b/base/metrics/histogram_functions.h similarity index 100% rename from src/base/metrics/histogram_functions.h rename to base/metrics/histogram_functions.h
diff --git a/src/base/metrics/histogram_functions_unittest.cc b/base/metrics/histogram_functions_unittest.cc similarity index 100% rename from src/base/metrics/histogram_functions_unittest.cc rename to base/metrics/histogram_functions_unittest.cc
diff --git a/src/base/metrics/histogram_macros.h b/base/metrics/histogram_macros.h similarity index 100% rename from src/base/metrics/histogram_macros.h rename to base/metrics/histogram_macros.h
diff --git a/src/base/metrics/histogram_macros_internal.h b/base/metrics/histogram_macros_internal.h similarity index 100% rename from src/base/metrics/histogram_macros_internal.h rename to base/metrics/histogram_macros_internal.h
diff --git a/src/base/metrics/histogram_macros_local.h b/base/metrics/histogram_macros_local.h similarity index 100% rename from src/base/metrics/histogram_macros_local.h rename to base/metrics/histogram_macros_local.h
diff --git a/src/base/metrics/histogram_macros_unittest.cc b/base/metrics/histogram_macros_unittest.cc similarity index 100% rename from src/base/metrics/histogram_macros_unittest.cc rename to base/metrics/histogram_macros_unittest.cc
diff --git a/src/base/metrics/histogram_samples.cc b/base/metrics/histogram_samples.cc similarity index 100% rename from src/base/metrics/histogram_samples.cc rename to base/metrics/histogram_samples.cc
diff --git a/src/base/metrics/histogram_samples.h b/base/metrics/histogram_samples.h similarity index 100% rename from src/base/metrics/histogram_samples.h rename to base/metrics/histogram_samples.h
diff --git a/src/base/metrics/histogram_samples_unittest.cc b/base/metrics/histogram_samples_unittest.cc similarity index 100% rename from src/base/metrics/histogram_samples_unittest.cc rename to base/metrics/histogram_samples_unittest.cc
diff --git a/src/base/metrics/histogram_snapshot_manager.cc b/base/metrics/histogram_snapshot_manager.cc similarity index 100% rename from src/base/metrics/histogram_snapshot_manager.cc rename to base/metrics/histogram_snapshot_manager.cc
diff --git a/src/base/metrics/histogram_snapshot_manager.h b/base/metrics/histogram_snapshot_manager.h similarity index 100% rename from src/base/metrics/histogram_snapshot_manager.h rename to base/metrics/histogram_snapshot_manager.h
diff --git a/src/base/metrics/histogram_snapshot_manager_unittest.cc b/base/metrics/histogram_snapshot_manager_unittest.cc similarity index 100% rename from src/base/metrics/histogram_snapshot_manager_unittest.cc rename to base/metrics/histogram_snapshot_manager_unittest.cc
diff --git a/src/base/metrics/histogram_unittest.cc b/base/metrics/histogram_unittest.cc similarity index 100% rename from src/base/metrics/histogram_unittest.cc rename to base/metrics/histogram_unittest.cc
diff --git a/src/base/metrics/histogram_unittest.nc b/base/metrics/histogram_unittest.nc similarity index 100% rename from src/base/metrics/histogram_unittest.nc rename to base/metrics/histogram_unittest.nc
diff --git a/src/base/metrics/metrics_hashes.cc b/base/metrics/metrics_hashes.cc similarity index 100% rename from src/base/metrics/metrics_hashes.cc rename to base/metrics/metrics_hashes.cc
diff --git a/src/base/metrics/metrics_hashes.h b/base/metrics/metrics_hashes.h similarity index 100% rename from src/base/metrics/metrics_hashes.h rename to base/metrics/metrics_hashes.h
diff --git a/src/base/metrics/metrics_hashes_unittest.cc b/base/metrics/metrics_hashes_unittest.cc similarity index 100% rename from src/base/metrics/metrics_hashes_unittest.cc rename to base/metrics/metrics_hashes_unittest.cc
diff --git a/src/base/metrics/persistent_histogram_allocator.cc b/base/metrics/persistent_histogram_allocator.cc similarity index 100% rename from src/base/metrics/persistent_histogram_allocator.cc rename to base/metrics/persistent_histogram_allocator.cc
diff --git a/src/base/metrics/persistent_histogram_allocator.h b/base/metrics/persistent_histogram_allocator.h similarity index 100% rename from src/base/metrics/persistent_histogram_allocator.h rename to base/metrics/persistent_histogram_allocator.h
diff --git a/src/base/metrics/persistent_histogram_allocator_unittest.cc b/base/metrics/persistent_histogram_allocator_unittest.cc similarity index 100% rename from src/base/metrics/persistent_histogram_allocator_unittest.cc rename to base/metrics/persistent_histogram_allocator_unittest.cc
diff --git a/src/base/metrics/persistent_histogram_storage.cc b/base/metrics/persistent_histogram_storage.cc similarity index 100% rename from src/base/metrics/persistent_histogram_storage.cc rename to base/metrics/persistent_histogram_storage.cc
diff --git a/src/base/metrics/persistent_histogram_storage.h b/base/metrics/persistent_histogram_storage.h similarity index 100% rename from src/base/metrics/persistent_histogram_storage.h rename to base/metrics/persistent_histogram_storage.h
diff --git a/src/base/metrics/persistent_histogram_storage_unittest.cc b/base/metrics/persistent_histogram_storage_unittest.cc similarity index 100% rename from src/base/metrics/persistent_histogram_storage_unittest.cc rename to base/metrics/persistent_histogram_storage_unittest.cc
diff --git a/src/base/metrics/persistent_memory_allocator.cc b/base/metrics/persistent_memory_allocator.cc similarity index 100% rename from src/base/metrics/persistent_memory_allocator.cc rename to base/metrics/persistent_memory_allocator.cc
diff --git a/src/base/metrics/persistent_memory_allocator.h b/base/metrics/persistent_memory_allocator.h similarity index 100% rename from src/base/metrics/persistent_memory_allocator.h rename to base/metrics/persistent_memory_allocator.h
diff --git a/src/base/metrics/persistent_memory_allocator_unittest.cc b/base/metrics/persistent_memory_allocator_unittest.cc similarity index 100% rename from src/base/metrics/persistent_memory_allocator_unittest.cc rename to base/metrics/persistent_memory_allocator_unittest.cc
diff --git a/src/base/metrics/persistent_sample_map.cc b/base/metrics/persistent_sample_map.cc similarity index 100% rename from src/base/metrics/persistent_sample_map.cc rename to base/metrics/persistent_sample_map.cc
diff --git a/src/base/metrics/persistent_sample_map.h b/base/metrics/persistent_sample_map.h similarity index 100% rename from src/base/metrics/persistent_sample_map.h rename to base/metrics/persistent_sample_map.h
diff --git a/src/base/metrics/persistent_sample_map_unittest.cc b/base/metrics/persistent_sample_map_unittest.cc similarity index 100% rename from src/base/metrics/persistent_sample_map_unittest.cc rename to base/metrics/persistent_sample_map_unittest.cc
diff --git a/src/base/metrics/record_histogram_checker.h b/base/metrics/record_histogram_checker.h similarity index 100% rename from src/base/metrics/record_histogram_checker.h rename to base/metrics/record_histogram_checker.h
diff --git a/src/base/metrics/sample_map.cc b/base/metrics/sample_map.cc similarity index 100% rename from src/base/metrics/sample_map.cc rename to base/metrics/sample_map.cc
diff --git a/src/base/metrics/sample_map.h b/base/metrics/sample_map.h similarity index 100% rename from src/base/metrics/sample_map.h rename to base/metrics/sample_map.h
diff --git a/src/base/metrics/sample_map_unittest.cc b/base/metrics/sample_map_unittest.cc similarity index 100% rename from src/base/metrics/sample_map_unittest.cc rename to base/metrics/sample_map_unittest.cc
diff --git a/src/base/metrics/sample_vector.cc b/base/metrics/sample_vector.cc similarity index 100% rename from src/base/metrics/sample_vector.cc rename to base/metrics/sample_vector.cc
diff --git a/src/base/metrics/sample_vector.h b/base/metrics/sample_vector.h similarity index 100% rename from src/base/metrics/sample_vector.h rename to base/metrics/sample_vector.h
diff --git a/src/base/metrics/sample_vector_unittest.cc b/base/metrics/sample_vector_unittest.cc similarity index 100% rename from src/base/metrics/sample_vector_unittest.cc rename to base/metrics/sample_vector_unittest.cc
diff --git a/src/base/metrics/single_sample_metrics.cc b/base/metrics/single_sample_metrics.cc similarity index 100% rename from src/base/metrics/single_sample_metrics.cc rename to base/metrics/single_sample_metrics.cc
diff --git a/src/base/metrics/single_sample_metrics.h b/base/metrics/single_sample_metrics.h similarity index 100% rename from src/base/metrics/single_sample_metrics.h rename to base/metrics/single_sample_metrics.h
diff --git a/src/base/metrics/single_sample_metrics_unittest.cc b/base/metrics/single_sample_metrics_unittest.cc similarity index 100% rename from src/base/metrics/single_sample_metrics_unittest.cc rename to base/metrics/single_sample_metrics_unittest.cc
diff --git a/src/base/metrics/sparse_histogram.cc b/base/metrics/sparse_histogram.cc similarity index 100% rename from src/base/metrics/sparse_histogram.cc rename to base/metrics/sparse_histogram.cc
diff --git a/src/base/metrics/sparse_histogram.h b/base/metrics/sparse_histogram.h similarity index 100% rename from src/base/metrics/sparse_histogram.h rename to base/metrics/sparse_histogram.h
diff --git a/src/base/metrics/sparse_histogram_unittest.cc b/base/metrics/sparse_histogram_unittest.cc similarity index 100% rename from src/base/metrics/sparse_histogram_unittest.cc rename to base/metrics/sparse_histogram_unittest.cc
diff --git a/src/base/metrics/statistics_recorder.cc b/base/metrics/statistics_recorder.cc similarity index 100% rename from src/base/metrics/statistics_recorder.cc rename to base/metrics/statistics_recorder.cc
diff --git a/src/base/metrics/statistics_recorder.h b/base/metrics/statistics_recorder.h similarity index 100% rename from src/base/metrics/statistics_recorder.h rename to base/metrics/statistics_recorder.h
diff --git a/src/base/metrics/statistics_recorder_unittest.cc b/base/metrics/statistics_recorder_unittest.cc similarity index 100% rename from src/base/metrics/statistics_recorder_unittest.cc rename to base/metrics/statistics_recorder_unittest.cc
diff --git a/src/base/metrics/ukm_source_id.cc b/base/metrics/ukm_source_id.cc similarity index 100% rename from src/base/metrics/ukm_source_id.cc rename to base/metrics/ukm_source_id.cc
diff --git a/src/base/metrics/ukm_source_id.h b/base/metrics/ukm_source_id.h similarity index 100% rename from src/base/metrics/ukm_source_id.h rename to base/metrics/ukm_source_id.h
diff --git a/src/base/metrics/user_metrics.cc b/base/metrics/user_metrics.cc similarity index 100% rename from src/base/metrics/user_metrics.cc rename to base/metrics/user_metrics.cc
diff --git a/src/base/metrics/user_metrics.h b/base/metrics/user_metrics.h similarity index 100% rename from src/base/metrics/user_metrics.h rename to base/metrics/user_metrics.h
diff --git a/src/base/metrics/user_metrics_action.h b/base/metrics/user_metrics_action.h similarity index 100% rename from src/base/metrics/user_metrics_action.h rename to base/metrics/user_metrics_action.h
diff --git a/src/base/native_library.cc b/base/native_library.cc similarity index 100% rename from src/base/native_library.cc rename to base/native_library.cc
diff --git a/src/base/native_library.h b/base/native_library.h similarity index 100% rename from src/base/native_library.h rename to base/native_library.h
diff --git a/src/base/native_library_fuchsia.cc b/base/native_library_fuchsia.cc similarity index 100% rename from src/base/native_library_fuchsia.cc rename to base/native_library_fuchsia.cc
diff --git a/src/base/native_library_ios.mm b/base/native_library_ios.mm similarity index 100% rename from src/base/native_library_ios.mm rename to base/native_library_ios.mm
diff --git a/src/base/native_library_mac.mm b/base/native_library_mac.mm similarity index 100% rename from src/base/native_library_mac.mm rename to base/native_library_mac.mm
diff --git a/src/base/native_library_posix.cc b/base/native_library_posix.cc similarity index 100% rename from src/base/native_library_posix.cc rename to base/native_library_posix.cc
diff --git a/src/base/native_library_unittest.cc b/base/native_library_unittest.cc similarity index 100% rename from src/base/native_library_unittest.cc rename to base/native_library_unittest.cc
diff --git a/src/base/native_library_win.cc b/base/native_library_win.cc similarity index 100% rename from src/base/native_library_win.cc rename to base/native_library_win.cc
diff --git a/src/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc similarity index 100% rename from src/base/nix/mime_util_xdg.cc rename to base/nix/mime_util_xdg.cc
diff --git a/src/base/nix/mime_util_xdg.h b/base/nix/mime_util_xdg.h similarity index 100% rename from src/base/nix/mime_util_xdg.h rename to base/nix/mime_util_xdg.h
diff --git a/src/base/nix/xdg_util.cc b/base/nix/xdg_util.cc similarity index 100% rename from src/base/nix/xdg_util.cc rename to base/nix/xdg_util.cc
diff --git a/src/base/nix/xdg_util.h b/base/nix/xdg_util.h similarity index 100% rename from src/base/nix/xdg_util.h rename to base/nix/xdg_util.h
diff --git a/src/base/nix/xdg_util_unittest.cc b/base/nix/xdg_util_unittest.cc similarity index 100% rename from src/base/nix/xdg_util_unittest.cc rename to base/nix/xdg_util_unittest.cc
diff --git a/src/base/no_destructor.h b/base/no_destructor.h similarity index 100% rename from src/base/no_destructor.h rename to base/no_destructor.h
diff --git a/src/base/no_destructor_unittest.cc b/base/no_destructor_unittest.cc similarity index 100% rename from src/base/no_destructor_unittest.cc rename to base/no_destructor_unittest.cc
diff --git a/src/base/numerics/BUILD.gn b/base/numerics/BUILD.gn similarity index 100% rename from src/base/numerics/BUILD.gn rename to base/numerics/BUILD.gn
diff --git a/src/base/numerics/README.md b/base/numerics/README.md similarity index 100% rename from src/base/numerics/README.md rename to base/numerics/README.md
diff --git a/src/base/numerics/checked_math.h b/base/numerics/checked_math.h similarity index 100% rename from src/base/numerics/checked_math.h rename to base/numerics/checked_math.h
diff --git a/src/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h similarity index 100% rename from src/base/numerics/checked_math_impl.h rename to base/numerics/checked_math_impl.h
diff --git a/src/base/numerics/clamped_math.h b/base/numerics/clamped_math.h similarity index 100% rename from src/base/numerics/clamped_math.h rename to base/numerics/clamped_math.h
diff --git a/src/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h similarity index 100% rename from src/base/numerics/clamped_math_impl.h rename to base/numerics/clamped_math_impl.h
diff --git a/src/base/numerics/math_constants.h b/base/numerics/math_constants.h similarity index 100% rename from src/base/numerics/math_constants.h rename to base/numerics/math_constants.h
diff --git a/src/base/numerics/ranges.h b/base/numerics/ranges.h similarity index 100% rename from src/base/numerics/ranges.h rename to base/numerics/ranges.h
diff --git a/src/base/numerics/safe_conversions.h b/base/numerics/safe_conversions.h similarity index 100% rename from src/base/numerics/safe_conversions.h rename to base/numerics/safe_conversions.h
diff --git a/src/base/numerics/safe_conversions_arm_impl.h b/base/numerics/safe_conversions_arm_impl.h similarity index 100% rename from src/base/numerics/safe_conversions_arm_impl.h rename to base/numerics/safe_conversions_arm_impl.h
diff --git a/src/base/numerics/safe_conversions_impl.h b/base/numerics/safe_conversions_impl.h similarity index 100% rename from src/base/numerics/safe_conversions_impl.h rename to base/numerics/safe_conversions_impl.h
diff --git a/src/base/numerics/safe_math.h b/base/numerics/safe_math.h similarity index 100% rename from src/base/numerics/safe_math.h rename to base/numerics/safe_math.h
diff --git a/src/base/numerics/safe_math_arm_impl.h b/base/numerics/safe_math_arm_impl.h similarity index 100% rename from src/base/numerics/safe_math_arm_impl.h rename to base/numerics/safe_math_arm_impl.h
diff --git a/src/base/numerics/safe_math_clang_gcc_impl.h b/base/numerics/safe_math_clang_gcc_impl.h similarity index 100% rename from src/base/numerics/safe_math_clang_gcc_impl.h rename to base/numerics/safe_math_clang_gcc_impl.h
diff --git a/src/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h similarity index 100% rename from src/base/numerics/safe_math_shared_impl.h rename to base/numerics/safe_math_shared_impl.h
diff --git a/src/base/observer_list.h b/base/observer_list.h similarity index 100% rename from src/base/observer_list.h rename to base/observer_list.h
diff --git a/src/base/observer_list_internal.cc b/base/observer_list_internal.cc similarity index 100% rename from src/base/observer_list_internal.cc rename to base/observer_list_internal.cc
diff --git a/src/base/observer_list_internal.h b/base/observer_list_internal.h similarity index 100% rename from src/base/observer_list_internal.h rename to base/observer_list_internal.h
diff --git a/src/base/observer_list_perftest.cc b/base/observer_list_perftest.cc similarity index 100% rename from src/base/observer_list_perftest.cc rename to base/observer_list_perftest.cc
diff --git a/src/base/observer_list_threadsafe.cc b/base/observer_list_threadsafe.cc similarity index 100% rename from src/base/observer_list_threadsafe.cc rename to base/observer_list_threadsafe.cc
diff --git a/src/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h similarity index 100% rename from src/base/observer_list_threadsafe.h rename to base/observer_list_threadsafe.h
diff --git a/src/base/observer_list_threadsafe_unittest.cc b/base/observer_list_threadsafe_unittest.cc similarity index 100% rename from src/base/observer_list_threadsafe_unittest.cc rename to base/observer_list_threadsafe_unittest.cc
diff --git a/src/base/observer_list_types.cc b/base/observer_list_types.cc similarity index 100% rename from src/base/observer_list_types.cc rename to base/observer_list_types.cc
diff --git a/src/base/observer_list_types.h b/base/observer_list_types.h similarity index 100% rename from src/base/observer_list_types.h rename to base/observer_list_types.h
diff --git a/src/base/observer_list_unittest.cc b/base/observer_list_unittest.cc similarity index 100% rename from src/base/observer_list_unittest.cc rename to base/observer_list_unittest.cc
diff --git a/src/base/observer_list_unittest.nc b/base/observer_list_unittest.nc similarity index 100% rename from src/base/observer_list_unittest.nc rename to base/observer_list_unittest.nc
diff --git a/src/base/optional.h b/base/optional.h similarity index 100% rename from src/base/optional.h rename to base/optional.h
diff --git a/src/base/optional_unittest.cc b/base/optional_unittest.cc similarity index 100% rename from src/base/optional_unittest.cc rename to base/optional_unittest.cc
diff --git a/src/base/optional_unittest.nc b/base/optional_unittest.nc similarity index 100% rename from src/base/optional_unittest.nc rename to base/optional_unittest.nc
diff --git a/src/base/os_compat_android.cc b/base/os_compat_android.cc similarity index 100% rename from src/base/os_compat_android.cc rename to base/os_compat_android.cc
diff --git a/src/base/os_compat_android.h b/base/os_compat_android.h similarity index 100% rename from src/base/os_compat_android.h rename to base/os_compat_android.h
diff --git a/src/base/os_compat_android_unittest.cc b/base/os_compat_android_unittest.cc similarity index 100% rename from src/base/os_compat_android_unittest.cc rename to base/os_compat_android_unittest.cc
diff --git a/src/base/os_compat_nacl.cc b/base/os_compat_nacl.cc similarity index 100% rename from src/base/os_compat_nacl.cc rename to base/os_compat_nacl.cc
diff --git a/src/base/os_compat_nacl.h b/base/os_compat_nacl.h similarity index 100% rename from src/base/os_compat_nacl.h rename to base/os_compat_nacl.h
diff --git a/src/base/path_service.cc b/base/path_service.cc similarity index 100% rename from src/base/path_service.cc rename to base/path_service.cc
diff --git a/src/base/path_service.h b/base/path_service.h similarity index 100% rename from src/base/path_service.h rename to base/path_service.h
diff --git a/src/base/path_service_unittest.cc b/base/path_service_unittest.cc similarity index 100% rename from src/base/path_service_unittest.cc rename to base/path_service_unittest.cc
diff --git a/src/base/pending_task.cc b/base/pending_task.cc similarity index 100% rename from src/base/pending_task.cc rename to base/pending_task.cc
diff --git a/src/base/pending_task.h b/base/pending_task.h similarity index 100% rename from src/base/pending_task.h rename to base/pending_task.h
diff --git a/src/base/pickle.cc b/base/pickle.cc similarity index 100% rename from src/base/pickle.cc rename to base/pickle.cc
diff --git a/src/base/pickle.h b/base/pickle.h similarity index 100% rename from src/base/pickle.h rename to base/pickle.h
diff --git a/src/base/pickle_unittest.cc b/base/pickle_unittest.cc similarity index 100% rename from src/base/pickle_unittest.cc rename to base/pickle_unittest.cc
diff --git a/src/base/posix/can_lower_nice_to.cc b/base/posix/can_lower_nice_to.cc similarity index 100% rename from src/base/posix/can_lower_nice_to.cc rename to base/posix/can_lower_nice_to.cc
diff --git a/src/base/posix/can_lower_nice_to.h b/base/posix/can_lower_nice_to.h similarity index 100% rename from src/base/posix/can_lower_nice_to.h rename to base/posix/can_lower_nice_to.h
diff --git a/src/base/posix/eintr_wrapper.h b/base/posix/eintr_wrapper.h similarity index 100% rename from src/base/posix/eintr_wrapper.h rename to base/posix/eintr_wrapper.h
diff --git a/src/base/posix/file_descriptor_shuffle.cc b/base/posix/file_descriptor_shuffle.cc similarity index 100% rename from src/base/posix/file_descriptor_shuffle.cc rename to base/posix/file_descriptor_shuffle.cc
diff --git a/src/base/posix/file_descriptor_shuffle.h b/base/posix/file_descriptor_shuffle.h similarity index 100% rename from src/base/posix/file_descriptor_shuffle.h rename to base/posix/file_descriptor_shuffle.h
diff --git a/src/base/posix/file_descriptor_shuffle_unittest.cc b/base/posix/file_descriptor_shuffle_unittest.cc similarity index 100% rename from src/base/posix/file_descriptor_shuffle_unittest.cc rename to base/posix/file_descriptor_shuffle_unittest.cc
diff --git a/src/base/posix/global_descriptors.cc b/base/posix/global_descriptors.cc similarity index 100% rename from src/base/posix/global_descriptors.cc rename to base/posix/global_descriptors.cc
diff --git a/src/base/posix/global_descriptors.h b/base/posix/global_descriptors.h similarity index 100% rename from src/base/posix/global_descriptors.h rename to base/posix/global_descriptors.h
diff --git a/src/base/posix/safe_strerror.cc b/base/posix/safe_strerror.cc similarity index 100% rename from src/base/posix/safe_strerror.cc rename to base/posix/safe_strerror.cc
diff --git a/src/base/posix/safe_strerror.h b/base/posix/safe_strerror.h similarity index 100% rename from src/base/posix/safe_strerror.h rename to base/posix/safe_strerror.h
diff --git a/src/base/posix/unix_domain_socket.cc b/base/posix/unix_domain_socket.cc similarity index 100% rename from src/base/posix/unix_domain_socket.cc rename to base/posix/unix_domain_socket.cc
diff --git a/src/base/posix/unix_domain_socket.h b/base/posix/unix_domain_socket.h similarity index 100% rename from src/base/posix/unix_domain_socket.h rename to base/posix/unix_domain_socket.h
diff --git a/src/base/posix/unix_domain_socket_unittest.cc b/base/posix/unix_domain_socket_unittest.cc similarity index 100% rename from src/base/posix/unix_domain_socket_unittest.cc rename to base/posix/unix_domain_socket_unittest.cc
diff --git a/src/base/post_task_and_reply_with_result_internal.h b/base/post_task_and_reply_with_result_internal.h similarity index 100% rename from src/base/post_task_and_reply_with_result_internal.h rename to base/post_task_and_reply_with_result_internal.h
diff --git a/src/base/power_monitor/power_monitor.cc b/base/power_monitor/power_monitor.cc similarity index 100% rename from src/base/power_monitor/power_monitor.cc rename to base/power_monitor/power_monitor.cc
diff --git a/src/base/power_monitor/power_monitor.h b/base/power_monitor/power_monitor.h similarity index 100% rename from src/base/power_monitor/power_monitor.h rename to base/power_monitor/power_monitor.h
diff --git a/src/base/power_monitor/power_monitor_device_source.cc b/base/power_monitor/power_monitor_device_source.cc similarity index 100% rename from src/base/power_monitor/power_monitor_device_source.cc rename to base/power_monitor/power_monitor_device_source.cc
diff --git a/src/base/power_monitor/power_monitor_device_source.h b/base/power_monitor/power_monitor_device_source.h similarity index 100% rename from src/base/power_monitor/power_monitor_device_source.h rename to base/power_monitor/power_monitor_device_source.h
diff --git a/src/base/power_monitor/power_monitor_device_source_android.cc b/base/power_monitor/power_monitor_device_source_android.cc similarity index 100% rename from src/base/power_monitor/power_monitor_device_source_android.cc rename to base/power_monitor/power_monitor_device_source_android.cc
diff --git a/src/base/power_monitor/power_monitor_device_source_chromeos.cc b/base/power_monitor/power_monitor_device_source_chromeos.cc similarity index 100% rename from src/base/power_monitor/power_monitor_device_source_chromeos.cc rename to base/power_monitor/power_monitor_device_source_chromeos.cc
diff --git a/src/base/power_monitor/power_monitor_device_source_ios.mm b/base/power_monitor/power_monitor_device_source_ios.mm similarity index 100% rename from src/base/power_monitor/power_monitor_device_source_ios.mm rename to base/power_monitor/power_monitor_device_source_ios.mm
diff --git a/src/base/power_monitor/power_monitor_device_source_mac.mm b/base/power_monitor/power_monitor_device_source_mac.mm similarity index 100% rename from src/base/power_monitor/power_monitor_device_source_mac.mm rename to base/power_monitor/power_monitor_device_source_mac.mm
diff --git a/src/base/power_monitor/power_monitor_device_source_stub.cc b/base/power_monitor/power_monitor_device_source_stub.cc similarity index 100% rename from src/base/power_monitor/power_monitor_device_source_stub.cc rename to base/power_monitor/power_monitor_device_source_stub.cc
diff --git a/src/base/power_monitor/power_monitor_device_source_win.cc b/base/power_monitor/power_monitor_device_source_win.cc similarity index 100% rename from src/base/power_monitor/power_monitor_device_source_win.cc rename to base/power_monitor/power_monitor_device_source_win.cc
diff --git a/src/base/power_monitor/power_monitor_source.cc b/base/power_monitor/power_monitor_source.cc similarity index 100% rename from src/base/power_monitor/power_monitor_source.cc rename to base/power_monitor/power_monitor_source.cc
diff --git a/src/base/power_monitor/power_monitor_source.h b/base/power_monitor/power_monitor_source.h similarity index 100% rename from src/base/power_monitor/power_monitor_source.h rename to base/power_monitor/power_monitor_source.h
diff --git a/src/base/power_monitor/power_monitor_unittest.cc b/base/power_monitor/power_monitor_unittest.cc similarity index 100% rename from src/base/power_monitor/power_monitor_unittest.cc rename to base/power_monitor/power_monitor_unittest.cc
diff --git a/src/base/power_monitor/power_observer.h b/base/power_monitor/power_observer.h similarity index 100% rename from src/base/power_monitor/power_observer.h rename to base/power_monitor/power_observer.h
diff --git a/src/base/process/internal_aix.cc b/base/process/internal_aix.cc similarity index 100% rename from src/base/process/internal_aix.cc rename to base/process/internal_aix.cc
diff --git a/src/base/process/internal_aix.h b/base/process/internal_aix.h similarity index 100% rename from src/base/process/internal_aix.h rename to base/process/internal_aix.h
diff --git a/src/base/process/internal_linux.cc b/base/process/internal_linux.cc similarity index 100% rename from src/base/process/internal_linux.cc rename to base/process/internal_linux.cc
diff --git a/src/base/process/internal_linux.h b/base/process/internal_linux.h similarity index 100% rename from src/base/process/internal_linux.h rename to base/process/internal_linux.h
diff --git a/src/base/process/kill.cc b/base/process/kill.cc similarity index 100% rename from src/base/process/kill.cc rename to base/process/kill.cc
diff --git a/src/base/process/kill.h b/base/process/kill.h similarity index 100% rename from src/base/process/kill.h rename to base/process/kill.h
diff --git a/src/base/process/kill_fuchsia.cc b/base/process/kill_fuchsia.cc similarity index 100% rename from src/base/process/kill_fuchsia.cc rename to base/process/kill_fuchsia.cc
diff --git a/src/base/process/kill_mac.cc b/base/process/kill_mac.cc similarity index 100% rename from src/base/process/kill_mac.cc rename to base/process/kill_mac.cc
diff --git a/src/base/process/kill_posix.cc b/base/process/kill_posix.cc similarity index 100% rename from src/base/process/kill_posix.cc rename to base/process/kill_posix.cc
diff --git a/src/base/process/kill_win.cc b/base/process/kill_win.cc similarity index 100% rename from src/base/process/kill_win.cc rename to base/process/kill_win.cc
diff --git a/src/base/process/launch.cc b/base/process/launch.cc similarity index 100% rename from src/base/process/launch.cc rename to base/process/launch.cc
diff --git a/src/base/process/launch.h b/base/process/launch.h similarity index 100% rename from src/base/process/launch.h rename to base/process/launch.h
diff --git a/src/base/process/launch_fuchsia.cc b/base/process/launch_fuchsia.cc similarity index 100% rename from src/base/process/launch_fuchsia.cc rename to base/process/launch_fuchsia.cc
diff --git a/src/base/process/launch_ios.cc b/base/process/launch_ios.cc similarity index 100% rename from src/base/process/launch_ios.cc rename to base/process/launch_ios.cc
diff --git a/src/base/process/launch_mac.cc b/base/process/launch_mac.cc similarity index 100% rename from src/base/process/launch_mac.cc rename to base/process/launch_mac.cc
diff --git a/src/base/process/launch_posix.cc b/base/process/launch_posix.cc similarity index 100% rename from src/base/process/launch_posix.cc rename to base/process/launch_posix.cc
diff --git a/src/base/process/launch_unittest_win.cc b/base/process/launch_unittest_win.cc similarity index 100% rename from src/base/process/launch_unittest_win.cc rename to base/process/launch_unittest_win.cc
diff --git a/src/base/process/launch_win.cc b/base/process/launch_win.cc similarity index 100% rename from src/base/process/launch_win.cc rename to base/process/launch_win.cc
diff --git a/src/base/process/memory.cc b/base/process/memory.cc similarity index 100% rename from src/base/process/memory.cc rename to base/process/memory.cc
diff --git a/src/base/process/memory.h b/base/process/memory.h similarity index 100% rename from src/base/process/memory.h rename to base/process/memory.h
diff --git a/src/base/process/memory_fuchsia.cc b/base/process/memory_fuchsia.cc similarity index 100% rename from src/base/process/memory_fuchsia.cc rename to base/process/memory_fuchsia.cc
diff --git a/src/base/process/memory_linux.cc b/base/process/memory_linux.cc similarity index 100% rename from src/base/process/memory_linux.cc rename to base/process/memory_linux.cc
diff --git a/src/base/process/memory_mac.mm b/base/process/memory_mac.mm similarity index 100% rename from src/base/process/memory_mac.mm rename to base/process/memory_mac.mm
diff --git a/src/base/process/memory_starboard.cc b/base/process/memory_starboard.cc similarity index 100% rename from src/base/process/memory_starboard.cc rename to base/process/memory_starboard.cc
diff --git a/src/base/process/memory_stubs.cc b/base/process/memory_stubs.cc similarity index 100% rename from src/base/process/memory_stubs.cc rename to base/process/memory_stubs.cc
diff --git a/src/base/process/memory_unittest.cc b/base/process/memory_unittest.cc similarity index 100% rename from src/base/process/memory_unittest.cc rename to base/process/memory_unittest.cc
diff --git a/src/base/process/memory_unittest_mac.h b/base/process/memory_unittest_mac.h similarity index 100% rename from src/base/process/memory_unittest_mac.h rename to base/process/memory_unittest_mac.h
diff --git a/src/base/process/memory_unittest_mac.mm b/base/process/memory_unittest_mac.mm similarity index 100% rename from src/base/process/memory_unittest_mac.mm rename to base/process/memory_unittest_mac.mm
diff --git a/src/base/process/memory_win.cc b/base/process/memory_win.cc similarity index 100% rename from src/base/process/memory_win.cc rename to base/process/memory_win.cc
diff --git a/src/base/process/port_provider_mac.cc b/base/process/port_provider_mac.cc similarity index 100% rename from src/base/process/port_provider_mac.cc rename to base/process/port_provider_mac.cc
diff --git a/src/base/process/port_provider_mac.h b/base/process/port_provider_mac.h similarity index 100% rename from src/base/process/port_provider_mac.h rename to base/process/port_provider_mac.h
diff --git a/src/base/process/process.h b/base/process/process.h similarity index 100% rename from src/base/process/process.h rename to base/process/process.h
diff --git a/src/base/process/process_fuchsia.cc b/base/process/process_fuchsia.cc similarity index 100% rename from src/base/process/process_fuchsia.cc rename to base/process/process_fuchsia.cc
diff --git a/src/base/process/process_handle.cc b/base/process/process_handle.cc similarity index 100% rename from src/base/process/process_handle.cc rename to base/process/process_handle.cc
diff --git a/src/base/process/process_handle.h b/base/process/process_handle.h similarity index 100% rename from src/base/process/process_handle.h rename to base/process/process_handle.h
diff --git a/src/base/process/process_handle_freebsd.cc b/base/process/process_handle_freebsd.cc similarity index 100% rename from src/base/process/process_handle_freebsd.cc rename to base/process/process_handle_freebsd.cc
diff --git a/src/base/process/process_handle_fuchsia.cc b/base/process/process_handle_fuchsia.cc similarity index 100% rename from src/base/process/process_handle_fuchsia.cc rename to base/process/process_handle_fuchsia.cc
diff --git a/src/base/process/process_handle_linux.cc b/base/process/process_handle_linux.cc similarity index 100% rename from src/base/process/process_handle_linux.cc rename to base/process/process_handle_linux.cc
diff --git a/src/base/process/process_handle_mac.cc b/base/process/process_handle_mac.cc similarity index 100% rename from src/base/process/process_handle_mac.cc rename to base/process/process_handle_mac.cc
diff --git a/src/base/process/process_handle_openbsd.cc b/base/process/process_handle_openbsd.cc similarity index 100% rename from src/base/process/process_handle_openbsd.cc rename to base/process/process_handle_openbsd.cc
diff --git a/src/base/process/process_handle_posix.cc b/base/process/process_handle_posix.cc similarity index 100% rename from src/base/process/process_handle_posix.cc rename to base/process/process_handle_posix.cc
diff --git a/src/base/process/process_handle_win.cc b/base/process/process_handle_win.cc similarity index 100% rename from src/base/process/process_handle_win.cc rename to base/process/process_handle_win.cc
diff --git a/src/base/process/process_info.h b/base/process/process_info.h similarity index 100% rename from src/base/process/process_info.h rename to base/process/process_info.h
diff --git a/src/base/process/process_info_fuchsia.cc b/base/process/process_info_fuchsia.cc similarity index 100% rename from src/base/process/process_info_fuchsia.cc rename to base/process/process_info_fuchsia.cc
diff --git a/src/base/process/process_info_linux.cc b/base/process/process_info_linux.cc similarity index 100% rename from src/base/process/process_info_linux.cc rename to base/process/process_info_linux.cc
diff --git a/src/base/process/process_info_mac.cc b/base/process/process_info_mac.cc similarity index 100% rename from src/base/process/process_info_mac.cc rename to base/process/process_info_mac.cc
diff --git a/src/base/process/process_info_unittest.cc b/base/process/process_info_unittest.cc similarity index 100% rename from src/base/process/process_info_unittest.cc rename to base/process/process_info_unittest.cc
diff --git a/src/base/process/process_info_win.cc b/base/process/process_info_win.cc similarity index 100% rename from src/base/process/process_info_win.cc rename to base/process/process_info_win.cc
diff --git a/src/base/process/process_iterator.cc b/base/process/process_iterator.cc similarity index 100% rename from src/base/process/process_iterator.cc rename to base/process/process_iterator.cc
diff --git a/src/base/process/process_iterator.h b/base/process/process_iterator.h similarity index 100% rename from src/base/process/process_iterator.h rename to base/process/process_iterator.h
diff --git a/src/base/process/process_iterator_freebsd.cc b/base/process/process_iterator_freebsd.cc similarity index 100% rename from src/base/process/process_iterator_freebsd.cc rename to base/process/process_iterator_freebsd.cc
diff --git a/src/base/process/process_iterator_fuchsia.cc b/base/process/process_iterator_fuchsia.cc similarity index 100% rename from src/base/process/process_iterator_fuchsia.cc rename to base/process/process_iterator_fuchsia.cc
diff --git a/src/base/process/process_iterator_linux.cc b/base/process/process_iterator_linux.cc similarity index 100% rename from src/base/process/process_iterator_linux.cc rename to base/process/process_iterator_linux.cc
diff --git a/src/base/process/process_iterator_mac.cc b/base/process/process_iterator_mac.cc similarity index 100% rename from src/base/process/process_iterator_mac.cc rename to base/process/process_iterator_mac.cc
diff --git a/src/base/process/process_iterator_openbsd.cc b/base/process/process_iterator_openbsd.cc similarity index 100% rename from src/base/process/process_iterator_openbsd.cc rename to base/process/process_iterator_openbsd.cc
diff --git a/src/base/process/process_iterator_win.cc b/base/process/process_iterator_win.cc similarity index 100% rename from src/base/process/process_iterator_win.cc rename to base/process/process_iterator_win.cc
diff --git a/src/base/process/process_linux.cc b/base/process/process_linux.cc similarity index 100% rename from src/base/process/process_linux.cc rename to base/process/process_linux.cc
diff --git a/src/base/process/process_mac.cc b/base/process/process_mac.cc similarity index 100% rename from src/base/process/process_mac.cc rename to base/process/process_mac.cc
diff --git a/src/base/process/process_metrics.cc b/base/process/process_metrics.cc similarity index 100% rename from src/base/process/process_metrics.cc rename to base/process/process_metrics.cc
diff --git a/src/base/process/process_metrics.h b/base/process/process_metrics.h similarity index 100% rename from src/base/process/process_metrics.h rename to base/process/process_metrics.h
diff --git a/src/base/process/process_metrics_freebsd.cc b/base/process/process_metrics_freebsd.cc similarity index 100% rename from src/base/process/process_metrics_freebsd.cc rename to base/process/process_metrics_freebsd.cc
diff --git a/src/base/process/process_metrics_fuchsia.cc b/base/process/process_metrics_fuchsia.cc similarity index 100% rename from src/base/process/process_metrics_fuchsia.cc rename to base/process/process_metrics_fuchsia.cc
diff --git a/src/base/process/process_metrics_iocounters.h b/base/process/process_metrics_iocounters.h similarity index 100% rename from src/base/process/process_metrics_iocounters.h rename to base/process/process_metrics_iocounters.h
diff --git a/src/base/process/process_metrics_ios.cc b/base/process/process_metrics_ios.cc similarity index 100% rename from src/base/process/process_metrics_ios.cc rename to base/process/process_metrics_ios.cc
diff --git a/src/base/process/process_metrics_linux.cc b/base/process/process_metrics_linux.cc similarity index 100% rename from src/base/process/process_metrics_linux.cc rename to base/process/process_metrics_linux.cc
diff --git a/src/base/process/process_metrics_mac.cc b/base/process/process_metrics_mac.cc similarity index 100% rename from src/base/process/process_metrics_mac.cc rename to base/process/process_metrics_mac.cc
diff --git a/src/base/process/process_metrics_nacl.cc b/base/process/process_metrics_nacl.cc similarity index 100% rename from src/base/process/process_metrics_nacl.cc rename to base/process/process_metrics_nacl.cc
diff --git a/src/base/process/process_metrics_openbsd.cc b/base/process/process_metrics_openbsd.cc similarity index 100% rename from src/base/process/process_metrics_openbsd.cc rename to base/process/process_metrics_openbsd.cc
diff --git a/src/base/process/process_metrics_posix.cc b/base/process/process_metrics_posix.cc similarity index 100% rename from src/base/process/process_metrics_posix.cc rename to base/process/process_metrics_posix.cc
diff --git a/src/base/process/process_metrics_unittest.cc b/base/process/process_metrics_unittest.cc similarity index 100% rename from src/base/process/process_metrics_unittest.cc rename to base/process/process_metrics_unittest.cc
diff --git a/src/base/process/process_metrics_win.cc b/base/process/process_metrics_win.cc similarity index 100% rename from src/base/process/process_metrics_win.cc rename to base/process/process_metrics_win.cc
diff --git a/src/base/process/process_posix.cc b/base/process/process_posix.cc similarity index 100% rename from src/base/process/process_posix.cc rename to base/process/process_posix.cc
diff --git a/src/base/process/process_starboard.cc b/base/process/process_starboard.cc similarity index 100% rename from src/base/process/process_starboard.cc rename to base/process/process_starboard.cc
diff --git a/src/base/process/process_unittest.cc b/base/process/process_unittest.cc similarity index 100% rename from src/base/process/process_unittest.cc rename to base/process/process_unittest.cc
diff --git a/src/base/process/process_util_unittest.cc b/base/process/process_util_unittest.cc similarity index 100% rename from src/base/process/process_util_unittest.cc rename to base/process/process_util_unittest.cc
diff --git a/src/base/process/process_win.cc b/base/process/process_win.cc similarity index 100% rename from src/base/process/process_win.cc rename to base/process/process_win.cc
diff --git a/src/base/profiler/native_stack_sampler.cc b/base/profiler/native_stack_sampler.cc similarity index 100% rename from src/base/profiler/native_stack_sampler.cc rename to base/profiler/native_stack_sampler.cc
diff --git a/src/base/profiler/native_stack_sampler.h b/base/profiler/native_stack_sampler.h similarity index 100% rename from src/base/profiler/native_stack_sampler.h rename to base/profiler/native_stack_sampler.h
diff --git a/src/base/profiler/native_stack_sampler_mac.cc b/base/profiler/native_stack_sampler_mac.cc similarity index 100% rename from src/base/profiler/native_stack_sampler_mac.cc rename to base/profiler/native_stack_sampler_mac.cc
diff --git a/src/base/profiler/native_stack_sampler_posix.cc b/base/profiler/native_stack_sampler_posix.cc similarity index 100% rename from src/base/profiler/native_stack_sampler_posix.cc rename to base/profiler/native_stack_sampler_posix.cc
diff --git a/src/base/profiler/native_stack_sampler_starboard.cc b/base/profiler/native_stack_sampler_starboard.cc similarity index 100% rename from src/base/profiler/native_stack_sampler_starboard.cc rename to base/profiler/native_stack_sampler_starboard.cc
diff --git a/src/base/profiler/native_stack_sampler_win.cc b/base/profiler/native_stack_sampler_win.cc similarity index 100% rename from src/base/profiler/native_stack_sampler_win.cc rename to base/profiler/native_stack_sampler_win.cc
diff --git a/src/base/profiler/stack_sampling_profiler.cc b/base/profiler/stack_sampling_profiler.cc similarity index 100% rename from src/base/profiler/stack_sampling_profiler.cc rename to base/profiler/stack_sampling_profiler.cc
diff --git a/src/base/profiler/stack_sampling_profiler.h b/base/profiler/stack_sampling_profiler.h similarity index 100% rename from src/base/profiler/stack_sampling_profiler.h rename to base/profiler/stack_sampling_profiler.h
diff --git a/src/base/profiler/stack_sampling_profiler_unittest.cc b/base/profiler/stack_sampling_profiler_unittest.cc similarity index 100% rename from src/base/profiler/stack_sampling_profiler_unittest.cc rename to base/profiler/stack_sampling_profiler_unittest.cc
diff --git a/src/base/profiler/test_support_library.cc b/base/profiler/test_support_library.cc similarity index 100% rename from src/base/profiler/test_support_library.cc rename to base/profiler/test_support_library.cc
diff --git a/src/base/profiler/win32_stack_frame_unwinder.cc b/base/profiler/win32_stack_frame_unwinder.cc similarity index 100% rename from src/base/profiler/win32_stack_frame_unwinder.cc rename to base/profiler/win32_stack_frame_unwinder.cc
diff --git a/src/base/profiler/win32_stack_frame_unwinder.h b/base/profiler/win32_stack_frame_unwinder.h similarity index 100% rename from src/base/profiler/win32_stack_frame_unwinder.h rename to base/profiler/win32_stack_frame_unwinder.h
diff --git a/src/base/profiler/win32_stack_frame_unwinder_unittest.cc b/base/profiler/win32_stack_frame_unwinder_unittest.cc similarity index 100% rename from src/base/profiler/win32_stack_frame_unwinder_unittest.cc rename to base/profiler/win32_stack_frame_unwinder_unittest.cc
diff --git a/src/base/rand_util.cc b/base/rand_util.cc similarity index 100% rename from src/base/rand_util.cc rename to base/rand_util.cc
diff --git a/src/base/rand_util.h b/base/rand_util.h similarity index 100% rename from src/base/rand_util.h rename to base/rand_util.h
diff --git a/src/base/rand_util_fuchsia.cc b/base/rand_util_fuchsia.cc similarity index 100% rename from src/base/rand_util_fuchsia.cc rename to base/rand_util_fuchsia.cc
diff --git a/src/base/rand_util_nacl.cc b/base/rand_util_nacl.cc similarity index 100% rename from src/base/rand_util_nacl.cc rename to base/rand_util_nacl.cc
diff --git a/src/base/rand_util_posix.cc b/base/rand_util_posix.cc similarity index 100% rename from src/base/rand_util_posix.cc rename to base/rand_util_posix.cc
diff --git a/src/base/rand_util_starboard.cc b/base/rand_util_starboard.cc similarity index 100% rename from src/base/rand_util_starboard.cc rename to base/rand_util_starboard.cc
diff --git a/src/base/rand_util_unittest.cc b/base/rand_util_unittest.cc similarity index 100% rename from src/base/rand_util_unittest.cc rename to base/rand_util_unittest.cc
diff --git a/src/base/rand_util_win.cc b/base/rand_util_win.cc similarity index 100% rename from src/base/rand_util_win.cc rename to base/rand_util_win.cc
diff --git a/src/base/run_loop.cc b/base/run_loop.cc similarity index 100% rename from src/base/run_loop.cc rename to base/run_loop.cc
diff --git a/src/base/run_loop.h b/base/run_loop.h similarity index 100% rename from src/base/run_loop.h rename to base/run_loop.h
diff --git a/src/base/run_loop_unittest.cc b/base/run_loop_unittest.cc similarity index 100% rename from src/base/run_loop_unittest.cc rename to base/run_loop_unittest.cc
diff --git a/src/base/safe_numerics_unittest.cc b/base/safe_numerics_unittest.cc similarity index 100% rename from src/base/safe_numerics_unittest.cc rename to base/safe_numerics_unittest.cc
diff --git a/src/base/sampling_heap_profiler/benchmark-octane.js b/base/sampling_heap_profiler/benchmark-octane.js similarity index 100% rename from src/base/sampling_heap_profiler/benchmark-octane.js rename to base/sampling_heap_profiler/benchmark-octane.js
diff --git a/src/base/sampling_heap_profiler/lock_free_address_hash_set.cc b/base/sampling_heap_profiler/lock_free_address_hash_set.cc similarity index 100% rename from src/base/sampling_heap_profiler/lock_free_address_hash_set.cc rename to base/sampling_heap_profiler/lock_free_address_hash_set.cc
diff --git a/src/base/sampling_heap_profiler/lock_free_address_hash_set.h b/base/sampling_heap_profiler/lock_free_address_hash_set.h similarity index 100% rename from src/base/sampling_heap_profiler/lock_free_address_hash_set.h rename to base/sampling_heap_profiler/lock_free_address_hash_set.h
diff --git a/src/base/sampling_heap_profiler/lock_free_address_hash_set_unittest.cc b/base/sampling_heap_profiler/lock_free_address_hash_set_unittest.cc similarity index 100% rename from src/base/sampling_heap_profiler/lock_free_address_hash_set_unittest.cc rename to base/sampling_heap_profiler/lock_free_address_hash_set_unittest.cc
diff --git a/src/base/sampling_heap_profiler/module_cache.cc b/base/sampling_heap_profiler/module_cache.cc similarity index 100% rename from src/base/sampling_heap_profiler/module_cache.cc rename to base/sampling_heap_profiler/module_cache.cc
diff --git a/src/base/sampling_heap_profiler/module_cache.h b/base/sampling_heap_profiler/module_cache.h similarity index 100% rename from src/base/sampling_heap_profiler/module_cache.h rename to base/sampling_heap_profiler/module_cache.h
diff --git a/src/base/sampling_heap_profiler/module_cache_mac.cc b/base/sampling_heap_profiler/module_cache_mac.cc similarity index 100% rename from src/base/sampling_heap_profiler/module_cache_mac.cc rename to base/sampling_heap_profiler/module_cache_mac.cc
diff --git a/src/base/sampling_heap_profiler/module_cache_posix.cc b/base/sampling_heap_profiler/module_cache_posix.cc similarity index 100% rename from src/base/sampling_heap_profiler/module_cache_posix.cc rename to base/sampling_heap_profiler/module_cache_posix.cc
diff --git a/src/base/sampling_heap_profiler/module_cache_starboard.cc b/base/sampling_heap_profiler/module_cache_starboard.cc similarity index 100% rename from src/base/sampling_heap_profiler/module_cache_starboard.cc rename to base/sampling_heap_profiler/module_cache_starboard.cc
diff --git a/src/base/sampling_heap_profiler/module_cache_unittest.cc b/base/sampling_heap_profiler/module_cache_unittest.cc similarity index 100% rename from src/base/sampling_heap_profiler/module_cache_unittest.cc rename to base/sampling_heap_profiler/module_cache_unittest.cc
diff --git a/src/base/sampling_heap_profiler/module_cache_win.cc b/base/sampling_heap_profiler/module_cache_win.cc similarity index 100% rename from src/base/sampling_heap_profiler/module_cache_win.cc rename to base/sampling_heap_profiler/module_cache_win.cc
diff --git a/src/base/sampling_heap_profiler/poisson_allocation_sampler.cc b/base/sampling_heap_profiler/poisson_allocation_sampler.cc similarity index 100% rename from src/base/sampling_heap_profiler/poisson_allocation_sampler.cc rename to base/sampling_heap_profiler/poisson_allocation_sampler.cc
diff --git a/src/base/sampling_heap_profiler/poisson_allocation_sampler.h b/base/sampling_heap_profiler/poisson_allocation_sampler.h similarity index 100% rename from src/base/sampling_heap_profiler/poisson_allocation_sampler.h rename to base/sampling_heap_profiler/poisson_allocation_sampler.h
diff --git a/src/base/sampling_heap_profiler/sampling_heap_profiler.cc b/base/sampling_heap_profiler/sampling_heap_profiler.cc similarity index 100% rename from src/base/sampling_heap_profiler/sampling_heap_profiler.cc rename to base/sampling_heap_profiler/sampling_heap_profiler.cc
diff --git a/src/base/sampling_heap_profiler/sampling_heap_profiler.h b/base/sampling_heap_profiler/sampling_heap_profiler.h similarity index 100% rename from src/base/sampling_heap_profiler/sampling_heap_profiler.h rename to base/sampling_heap_profiler/sampling_heap_profiler.h
diff --git a/src/base/sampling_heap_profiler/sampling_heap_profiler_unittest.cc b/base/sampling_heap_profiler/sampling_heap_profiler_unittest.cc similarity index 100% rename from src/base/sampling_heap_profiler/sampling_heap_profiler_unittest.cc rename to base/sampling_heap_profiler/sampling_heap_profiler_unittest.cc
diff --git a/src/base/scoped_clear_last_error.h b/base/scoped_clear_last_error.h similarity index 100% rename from src/base/scoped_clear_last_error.h rename to base/scoped_clear_last_error.h
diff --git a/src/base/scoped_clear_last_error_unittest.cc b/base/scoped_clear_last_error_unittest.cc similarity index 100% rename from src/base/scoped_clear_last_error_unittest.cc rename to base/scoped_clear_last_error_unittest.cc
diff --git a/src/base/scoped_clear_last_error_win.cc b/base/scoped_clear_last_error_win.cc similarity index 100% rename from src/base/scoped_clear_last_error_win.cc rename to base/scoped_clear_last_error_win.cc
diff --git a/src/base/scoped_generic.h b/base/scoped_generic.h similarity index 100% rename from src/base/scoped_generic.h rename to base/scoped_generic.h
diff --git a/src/base/scoped_generic_unittest.cc b/base/scoped_generic_unittest.cc similarity index 100% rename from src/base/scoped_generic_unittest.cc rename to base/scoped_generic_unittest.cc
diff --git a/src/base/scoped_native_library.cc b/base/scoped_native_library.cc similarity index 100% rename from src/base/scoped_native_library.cc rename to base/scoped_native_library.cc
diff --git a/src/base/scoped_native_library.h b/base/scoped_native_library.h similarity index 100% rename from src/base/scoped_native_library.h rename to base/scoped_native_library.h
diff --git a/src/base/scoped_native_library_unittest.cc b/base/scoped_native_library_unittest.cc similarity index 100% rename from src/base/scoped_native_library_unittest.cc rename to base/scoped_native_library_unittest.cc
diff --git a/src/base/scoped_observer.h b/base/scoped_observer.h similarity index 100% rename from src/base/scoped_observer.h rename to base/scoped_observer.h
diff --git a/src/base/security_unittest.cc b/base/security_unittest.cc similarity index 100% rename from src/base/security_unittest.cc rename to base/security_unittest.cc
diff --git a/src/base/sequence_checker.h b/base/sequence_checker.h similarity index 100% rename from src/base/sequence_checker.h rename to base/sequence_checker.h
diff --git a/src/base/sequence_checker_impl.cc b/base/sequence_checker_impl.cc similarity index 100% rename from src/base/sequence_checker_impl.cc rename to base/sequence_checker_impl.cc
diff --git a/src/base/sequence_checker_impl.h b/base/sequence_checker_impl.h similarity index 100% rename from src/base/sequence_checker_impl.h rename to base/sequence_checker_impl.h
diff --git a/src/base/sequence_checker_unittest.cc b/base/sequence_checker_unittest.cc similarity index 100% rename from src/base/sequence_checker_unittest.cc rename to base/sequence_checker_unittest.cc
diff --git a/src/base/sequence_token.cc b/base/sequence_token.cc similarity index 100% rename from src/base/sequence_token.cc rename to base/sequence_token.cc
diff --git a/src/base/sequence_token.h b/base/sequence_token.h similarity index 100% rename from src/base/sequence_token.h rename to base/sequence_token.h
diff --git a/src/base/sequence_token_unittest.cc b/base/sequence_token_unittest.cc similarity index 100% rename from src/base/sequence_token_unittest.cc rename to base/sequence_token_unittest.cc
diff --git a/src/base/sequenced_task_runner.cc b/base/sequenced_task_runner.cc similarity index 100% rename from src/base/sequenced_task_runner.cc rename to base/sequenced_task_runner.cc
diff --git a/src/base/sequenced_task_runner.h b/base/sequenced_task_runner.h similarity index 100% rename from src/base/sequenced_task_runner.h rename to base/sequenced_task_runner.h
diff --git a/src/base/sequenced_task_runner_helpers.h b/base/sequenced_task_runner_helpers.h similarity index 100% rename from src/base/sequenced_task_runner_helpers.h rename to base/sequenced_task_runner_helpers.h
diff --git a/src/base/sequenced_task_runner_unittest.cc b/base/sequenced_task_runner_unittest.cc similarity index 100% rename from src/base/sequenced_task_runner_unittest.cc rename to base/sequenced_task_runner_unittest.cc
diff --git a/src/base/sha1.cc b/base/sha1.cc similarity index 100% rename from src/base/sha1.cc rename to base/sha1.cc
diff --git a/src/base/sha1.h b/base/sha1.h similarity index 100% rename from src/base/sha1.h rename to base/sha1.h
diff --git a/src/base/sha1_unittest.cc b/base/sha1_unittest.cc similarity index 100% rename from src/base/sha1_unittest.cc rename to base/sha1_unittest.cc
diff --git a/src/base/single_thread_task_runner.cc b/base/single_thread_task_runner.cc similarity index 100% rename from src/base/single_thread_task_runner.cc rename to base/single_thread_task_runner.cc
diff --git a/src/base/single_thread_task_runner.h b/base/single_thread_task_runner.h similarity index 100% rename from src/base/single_thread_task_runner.h rename to base/single_thread_task_runner.h
diff --git a/src/base/stl_util.h b/base/stl_util.h similarity index 100% rename from src/base/stl_util.h rename to base/stl_util.h
diff --git a/src/base/stl_util_unittest.cc b/base/stl_util_unittest.cc similarity index 100% rename from src/base/stl_util_unittest.cc rename to base/stl_util_unittest.cc
diff --git a/src/base/strings/char_traits.h b/base/strings/char_traits.h similarity index 100% rename from src/base/strings/char_traits.h rename to base/strings/char_traits.h
diff --git a/src/base/strings/char_traits_unittest.cc b/base/strings/char_traits_unittest.cc similarity index 100% rename from src/base/strings/char_traits_unittest.cc rename to base/strings/char_traits_unittest.cc
diff --git a/src/base/strings/latin1_string_conversions.cc b/base/strings/latin1_string_conversions.cc similarity index 100% rename from src/base/strings/latin1_string_conversions.cc rename to base/strings/latin1_string_conversions.cc
diff --git a/src/base/strings/latin1_string_conversions.h b/base/strings/latin1_string_conversions.h similarity index 100% rename from src/base/strings/latin1_string_conversions.h rename to base/strings/latin1_string_conversions.h
diff --git a/src/base/strings/nullable_string16.cc b/base/strings/nullable_string16.cc similarity index 100% rename from src/base/strings/nullable_string16.cc rename to base/strings/nullable_string16.cc
diff --git a/src/base/strings/nullable_string16.h b/base/strings/nullable_string16.h similarity index 100% rename from src/base/strings/nullable_string16.h rename to base/strings/nullable_string16.h
diff --git a/src/base/strings/nullable_string16_unittest.cc b/base/strings/nullable_string16_unittest.cc similarity index 100% rename from src/base/strings/nullable_string16_unittest.cc rename to base/strings/nullable_string16_unittest.cc
diff --git a/src/base/strings/pattern.cc b/base/strings/pattern.cc similarity index 100% rename from src/base/strings/pattern.cc rename to base/strings/pattern.cc
diff --git a/src/base/strings/pattern.h b/base/strings/pattern.h similarity index 100% rename from src/base/strings/pattern.h rename to base/strings/pattern.h
diff --git a/src/base/strings/pattern_unittest.cc b/base/strings/pattern_unittest.cc similarity index 100% rename from src/base/strings/pattern_unittest.cc rename to base/strings/pattern_unittest.cc
diff --git a/src/base/strings/safe_sprintf.cc b/base/strings/safe_sprintf.cc similarity index 100% rename from src/base/strings/safe_sprintf.cc rename to base/strings/safe_sprintf.cc
diff --git a/src/base/strings/safe_sprintf.h b/base/strings/safe_sprintf.h similarity index 100% rename from src/base/strings/safe_sprintf.h rename to base/strings/safe_sprintf.h
diff --git a/src/base/strings/safe_sprintf_unittest.cc b/base/strings/safe_sprintf_unittest.cc similarity index 100% rename from src/base/strings/safe_sprintf_unittest.cc rename to base/strings/safe_sprintf_unittest.cc
diff --git a/src/base/strings/strcat.cc b/base/strings/strcat.cc similarity index 100% rename from src/base/strings/strcat.cc rename to base/strings/strcat.cc
diff --git a/src/base/strings/strcat.h b/base/strings/strcat.h similarity index 100% rename from src/base/strings/strcat.h rename to base/strings/strcat.h
diff --git a/src/base/strings/strcat_unittest.cc b/base/strings/strcat_unittest.cc similarity index 100% rename from src/base/strings/strcat_unittest.cc rename to base/strings/strcat_unittest.cc
diff --git a/src/base/strings/string16.cc b/base/strings/string16.cc similarity index 100% rename from src/base/strings/string16.cc rename to base/strings/string16.cc
diff --git a/src/base/strings/string16.h b/base/strings/string16.h similarity index 100% rename from src/base/strings/string16.h rename to base/strings/string16.h
diff --git a/src/base/strings/string16_unittest.cc b/base/strings/string16_unittest.cc similarity index 100% rename from src/base/strings/string16_unittest.cc rename to base/strings/string16_unittest.cc
diff --git a/src/base/strings/string16_unittest.nc b/base/strings/string16_unittest.nc similarity index 100% rename from src/base/strings/string16_unittest.nc rename to base/strings/string16_unittest.nc
diff --git a/src/base/strings/string_number_conversions.cc b/base/strings/string_number_conversions.cc similarity index 100% rename from src/base/strings/string_number_conversions.cc rename to base/strings/string_number_conversions.cc
diff --git a/src/base/strings/string_number_conversions.h b/base/strings/string_number_conversions.h similarity index 100% rename from src/base/strings/string_number_conversions.h rename to base/strings/string_number_conversions.h
diff --git a/src/base/strings/string_number_conversions_fuzzer.cc b/base/strings/string_number_conversions_fuzzer.cc similarity index 100% rename from src/base/strings/string_number_conversions_fuzzer.cc rename to base/strings/string_number_conversions_fuzzer.cc
diff --git a/src/base/strings/string_number_conversions_unittest.cc b/base/strings/string_number_conversions_unittest.cc similarity index 100% rename from src/base/strings/string_number_conversions_unittest.cc rename to base/strings/string_number_conversions_unittest.cc
diff --git a/src/base/strings/string_piece.cc b/base/strings/string_piece.cc similarity index 100% rename from src/base/strings/string_piece.cc rename to base/strings/string_piece.cc
diff --git a/src/base/strings/string_piece.h b/base/strings/string_piece.h similarity index 100% rename from src/base/strings/string_piece.h rename to base/strings/string_piece.h
diff --git a/src/base/strings/string_piece_forward.h b/base/strings/string_piece_forward.h similarity index 100% rename from src/base/strings/string_piece_forward.h rename to base/strings/string_piece_forward.h
diff --git a/src/base/strings/string_piece_unittest.cc b/base/strings/string_piece_unittest.cc similarity index 100% rename from src/base/strings/string_piece_unittest.cc rename to base/strings/string_piece_unittest.cc
diff --git a/src/base/strings/string_split.cc b/base/strings/string_split.cc similarity index 100% rename from src/base/strings/string_split.cc rename to base/strings/string_split.cc
diff --git a/src/base/strings/string_split.h b/base/strings/string_split.h similarity index 100% rename from src/base/strings/string_split.h rename to base/strings/string_split.h
diff --git a/src/base/strings/string_split_unittest.cc b/base/strings/string_split_unittest.cc similarity index 100% rename from src/base/strings/string_split_unittest.cc rename to base/strings/string_split_unittest.cc
diff --git a/src/base/strings/string_tokenizer.h b/base/strings/string_tokenizer.h similarity index 100% rename from src/base/strings/string_tokenizer.h rename to base/strings/string_tokenizer.h
diff --git a/src/base/strings/string_tokenizer_fuzzer.cc b/base/strings/string_tokenizer_fuzzer.cc similarity index 100% rename from src/base/strings/string_tokenizer_fuzzer.cc rename to base/strings/string_tokenizer_fuzzer.cc
diff --git a/src/base/strings/string_tokenizer_unittest.cc b/base/strings/string_tokenizer_unittest.cc similarity index 100% rename from src/base/strings/string_tokenizer_unittest.cc rename to base/strings/string_tokenizer_unittest.cc
diff --git a/src/base/strings/string_util.cc b/base/strings/string_util.cc similarity index 100% rename from src/base/strings/string_util.cc rename to base/strings/string_util.cc
diff --git a/src/base/strings/string_util.h b/base/strings/string_util.h similarity index 100% rename from src/base/strings/string_util.h rename to base/strings/string_util.h
diff --git a/src/base/strings/string_util_constants.cc b/base/strings/string_util_constants.cc similarity index 100% rename from src/base/strings/string_util_constants.cc rename to base/strings/string_util_constants.cc
diff --git a/src/base/strings/string_util_posix.h b/base/strings/string_util_posix.h similarity index 100% rename from src/base/strings/string_util_posix.h rename to base/strings/string_util_posix.h
diff --git a/src/base/strings/string_util_starboard.h b/base/strings/string_util_starboard.h similarity index 100% rename from src/base/strings/string_util_starboard.h rename to base/strings/string_util_starboard.h
diff --git a/src/base/strings/string_util_unittest.cc b/base/strings/string_util_unittest.cc similarity index 100% rename from src/base/strings/string_util_unittest.cc rename to base/strings/string_util_unittest.cc
diff --git a/src/base/strings/string_util_win.h b/base/strings/string_util_win.h similarity index 100% rename from src/base/strings/string_util_win.h rename to base/strings/string_util_win.h
diff --git a/src/base/strings/stringize_macros.h b/base/strings/stringize_macros.h similarity index 100% rename from src/base/strings/stringize_macros.h rename to base/strings/stringize_macros.h
diff --git a/src/base/strings/stringize_macros_unittest.cc b/base/strings/stringize_macros_unittest.cc similarity index 100% rename from src/base/strings/stringize_macros_unittest.cc rename to base/strings/stringize_macros_unittest.cc
diff --git a/src/base/strings/stringprintf.cc b/base/strings/stringprintf.cc similarity index 100% rename from src/base/strings/stringprintf.cc rename to base/strings/stringprintf.cc
diff --git a/src/base/strings/stringprintf.h b/base/strings/stringprintf.h similarity index 100% rename from src/base/strings/stringprintf.h rename to base/strings/stringprintf.h
diff --git a/src/base/strings/stringprintf_unittest.cc b/base/strings/stringprintf_unittest.cc similarity index 100% rename from src/base/strings/stringprintf_unittest.cc rename to base/strings/stringprintf_unittest.cc
diff --git a/src/base/strings/sys_string_conversions.h b/base/strings/sys_string_conversions.h similarity index 100% rename from src/base/strings/sys_string_conversions.h rename to base/strings/sys_string_conversions.h
diff --git a/src/base/strings/sys_string_conversions_mac.mm b/base/strings/sys_string_conversions_mac.mm similarity index 100% rename from src/base/strings/sys_string_conversions_mac.mm rename to base/strings/sys_string_conversions_mac.mm
diff --git a/src/base/strings/sys_string_conversions_mac_unittest.mm b/base/strings/sys_string_conversions_mac_unittest.mm similarity index 100% rename from src/base/strings/sys_string_conversions_mac_unittest.mm rename to base/strings/sys_string_conversions_mac_unittest.mm
diff --git a/src/base/strings/sys_string_conversions_posix.cc b/base/strings/sys_string_conversions_posix.cc similarity index 100% rename from src/base/strings/sys_string_conversions_posix.cc rename to base/strings/sys_string_conversions_posix.cc
diff --git a/src/base/strings/sys_string_conversions_starboard.cc b/base/strings/sys_string_conversions_starboard.cc similarity index 100% rename from src/base/strings/sys_string_conversions_starboard.cc rename to base/strings/sys_string_conversions_starboard.cc
diff --git a/src/base/strings/sys_string_conversions_unittest.cc b/base/strings/sys_string_conversions_unittest.cc similarity index 100% rename from src/base/strings/sys_string_conversions_unittest.cc rename to base/strings/sys_string_conversions_unittest.cc
diff --git a/src/base/strings/sys_string_conversions_win.cc b/base/strings/sys_string_conversions_win.cc similarity index 100% rename from src/base/strings/sys_string_conversions_win.cc rename to base/strings/sys_string_conversions_win.cc
diff --git a/src/base/strings/utf_offset_string_conversions.cc b/base/strings/utf_offset_string_conversions.cc similarity index 100% rename from src/base/strings/utf_offset_string_conversions.cc rename to base/strings/utf_offset_string_conversions.cc
diff --git a/src/base/strings/utf_offset_string_conversions.h b/base/strings/utf_offset_string_conversions.h similarity index 100% rename from src/base/strings/utf_offset_string_conversions.h rename to base/strings/utf_offset_string_conversions.h
diff --git a/src/base/strings/utf_offset_string_conversions_unittest.cc b/base/strings/utf_offset_string_conversions_unittest.cc similarity index 100% rename from src/base/strings/utf_offset_string_conversions_unittest.cc rename to base/strings/utf_offset_string_conversions_unittest.cc
diff --git a/src/base/strings/utf_string_conversion_utils.cc b/base/strings/utf_string_conversion_utils.cc similarity index 100% rename from src/base/strings/utf_string_conversion_utils.cc rename to base/strings/utf_string_conversion_utils.cc
diff --git a/src/base/strings/utf_string_conversion_utils.h b/base/strings/utf_string_conversion_utils.h similarity index 100% rename from src/base/strings/utf_string_conversion_utils.h rename to base/strings/utf_string_conversion_utils.h
diff --git a/src/base/strings/utf_string_conversions.cc b/base/strings/utf_string_conversions.cc similarity index 100% rename from src/base/strings/utf_string_conversions.cc rename to base/strings/utf_string_conversions.cc
diff --git a/src/base/strings/utf_string_conversions.h b/base/strings/utf_string_conversions.h similarity index 100% rename from src/base/strings/utf_string_conversions.h rename to base/strings/utf_string_conversions.h
diff --git a/src/base/strings/utf_string_conversions_fuzzer.cc b/base/strings/utf_string_conversions_fuzzer.cc similarity index 100% rename from src/base/strings/utf_string_conversions_fuzzer.cc rename to base/strings/utf_string_conversions_fuzzer.cc
diff --git a/src/base/strings/utf_string_conversions_unittest.cc b/base/strings/utf_string_conversions_unittest.cc similarity index 100% rename from src/base/strings/utf_string_conversions_unittest.cc rename to base/strings/utf_string_conversions_unittest.cc
diff --git a/src/base/supports_user_data.cc b/base/supports_user_data.cc similarity index 100% rename from src/base/supports_user_data.cc rename to base/supports_user_data.cc
diff --git a/src/base/supports_user_data.h b/base/supports_user_data.h similarity index 100% rename from src/base/supports_user_data.h rename to base/supports_user_data.h
diff --git a/src/base/supports_user_data_unittest.cc b/base/supports_user_data_unittest.cc similarity index 100% rename from src/base/supports_user_data_unittest.cc rename to base/supports_user_data_unittest.cc
diff --git a/src/base/sync_socket.h b/base/sync_socket.h similarity index 100% rename from src/base/sync_socket.h rename to base/sync_socket.h
diff --git a/src/base/sync_socket_nacl.cc b/base/sync_socket_nacl.cc similarity index 100% rename from src/base/sync_socket_nacl.cc rename to base/sync_socket_nacl.cc
diff --git a/src/base/sync_socket_posix.cc b/base/sync_socket_posix.cc similarity index 100% rename from src/base/sync_socket_posix.cc rename to base/sync_socket_posix.cc
diff --git a/src/base/sync_socket_unittest.cc b/base/sync_socket_unittest.cc similarity index 100% rename from src/base/sync_socket_unittest.cc rename to base/sync_socket_unittest.cc
diff --git a/src/base/sync_socket_win.cc b/base/sync_socket_win.cc similarity index 100% rename from src/base/sync_socket_win.cc rename to base/sync_socket_win.cc
diff --git a/src/base/synchronization/atomic_flag.cc b/base/synchronization/atomic_flag.cc similarity index 100% rename from src/base/synchronization/atomic_flag.cc rename to base/synchronization/atomic_flag.cc
diff --git a/src/base/synchronization/atomic_flag.h b/base/synchronization/atomic_flag.h similarity index 100% rename from src/base/synchronization/atomic_flag.h rename to base/synchronization/atomic_flag.h
diff --git a/src/base/synchronization/atomic_flag_unittest.cc b/base/synchronization/atomic_flag_unittest.cc similarity index 100% rename from src/base/synchronization/atomic_flag_unittest.cc rename to base/synchronization/atomic_flag_unittest.cc
diff --git a/src/base/synchronization/cancellation_flag.h b/base/synchronization/cancellation_flag.h similarity index 100% rename from src/base/synchronization/cancellation_flag.h rename to base/synchronization/cancellation_flag.h
diff --git a/src/base/synchronization/condition_variable.h b/base/synchronization/condition_variable.h similarity index 100% rename from src/base/synchronization/condition_variable.h rename to base/synchronization/condition_variable.h
diff --git a/src/base/synchronization/condition_variable_posix.cc b/base/synchronization/condition_variable_posix.cc similarity index 100% rename from src/base/synchronization/condition_variable_posix.cc rename to base/synchronization/condition_variable_posix.cc
diff --git a/src/base/synchronization/condition_variable_starboard.cc b/base/synchronization/condition_variable_starboard.cc similarity index 100% rename from src/base/synchronization/condition_variable_starboard.cc rename to base/synchronization/condition_variable_starboard.cc
diff --git a/src/base/synchronization/condition_variable_unittest.cc b/base/synchronization/condition_variable_unittest.cc similarity index 100% rename from src/base/synchronization/condition_variable_unittest.cc rename to base/synchronization/condition_variable_unittest.cc
diff --git a/src/base/synchronization/condition_variable_win.cc b/base/synchronization/condition_variable_win.cc similarity index 100% rename from src/base/synchronization/condition_variable_win.cc rename to base/synchronization/condition_variable_win.cc
diff --git a/src/base/synchronization/lock.cc b/base/synchronization/lock.cc similarity index 100% rename from src/base/synchronization/lock.cc rename to base/synchronization/lock.cc
diff --git a/src/base/synchronization/lock.h b/base/synchronization/lock.h similarity index 100% rename from src/base/synchronization/lock.h rename to base/synchronization/lock.h
diff --git a/src/base/synchronization/lock_impl.h b/base/synchronization/lock_impl.h similarity index 100% rename from src/base/synchronization/lock_impl.h rename to base/synchronization/lock_impl.h
diff --git a/src/base/synchronization/lock_impl_posix.cc b/base/synchronization/lock_impl_posix.cc similarity index 100% rename from src/base/synchronization/lock_impl_posix.cc rename to base/synchronization/lock_impl_posix.cc
diff --git a/src/base/synchronization/lock_impl_starboard.cc b/base/synchronization/lock_impl_starboard.cc similarity index 100% rename from src/base/synchronization/lock_impl_starboard.cc rename to base/synchronization/lock_impl_starboard.cc
diff --git a/src/base/synchronization/lock_impl_win.cc b/base/synchronization/lock_impl_win.cc similarity index 100% rename from src/base/synchronization/lock_impl_win.cc rename to base/synchronization/lock_impl_win.cc
diff --git a/src/base/synchronization/lock_unittest.cc b/base/synchronization/lock_unittest.cc similarity index 100% rename from src/base/synchronization/lock_unittest.cc rename to base/synchronization/lock_unittest.cc
diff --git a/src/base/synchronization/spin_wait.h b/base/synchronization/spin_wait.h similarity index 100% rename from src/base/synchronization/spin_wait.h rename to base/synchronization/spin_wait.h
diff --git a/src/base/synchronization/waitable_event.h b/base/synchronization/waitable_event.h similarity index 100% rename from src/base/synchronization/waitable_event.h rename to base/synchronization/waitable_event.h
diff --git a/src/base/synchronization/waitable_event_mac.cc b/base/synchronization/waitable_event_mac.cc similarity index 100% rename from src/base/synchronization/waitable_event_mac.cc rename to base/synchronization/waitable_event_mac.cc
diff --git a/src/base/synchronization/waitable_event_perftest.cc b/base/synchronization/waitable_event_perftest.cc similarity index 100% rename from src/base/synchronization/waitable_event_perftest.cc rename to base/synchronization/waitable_event_perftest.cc
diff --git a/src/base/synchronization/waitable_event_posix.cc b/base/synchronization/waitable_event_posix.cc similarity index 100% rename from src/base/synchronization/waitable_event_posix.cc rename to base/synchronization/waitable_event_posix.cc
diff --git a/src/base/synchronization/waitable_event_starboard.cc b/base/synchronization/waitable_event_starboard.cc similarity index 100% rename from src/base/synchronization/waitable_event_starboard.cc rename to base/synchronization/waitable_event_starboard.cc
diff --git a/src/base/synchronization/waitable_event_unittest.cc b/base/synchronization/waitable_event_unittest.cc similarity index 100% rename from src/base/synchronization/waitable_event_unittest.cc rename to base/synchronization/waitable_event_unittest.cc
diff --git a/src/base/synchronization/waitable_event_watcher.h b/base/synchronization/waitable_event_watcher.h similarity index 100% rename from src/base/synchronization/waitable_event_watcher.h rename to base/synchronization/waitable_event_watcher.h
diff --git a/src/base/synchronization/waitable_event_watcher_mac.cc b/base/synchronization/waitable_event_watcher_mac.cc similarity index 100% rename from src/base/synchronization/waitable_event_watcher_mac.cc rename to base/synchronization/waitable_event_watcher_mac.cc
diff --git a/src/base/synchronization/waitable_event_watcher_posix.cc b/base/synchronization/waitable_event_watcher_posix.cc similarity index 100% rename from src/base/synchronization/waitable_event_watcher_posix.cc rename to base/synchronization/waitable_event_watcher_posix.cc
diff --git a/src/base/synchronization/waitable_event_watcher_unittest.cc b/base/synchronization/waitable_event_watcher_unittest.cc similarity index 100% rename from src/base/synchronization/waitable_event_watcher_unittest.cc rename to base/synchronization/waitable_event_watcher_unittest.cc
diff --git a/src/base/synchronization/waitable_event_watcher_win.cc b/base/synchronization/waitable_event_watcher_win.cc similarity index 100% rename from src/base/synchronization/waitable_event_watcher_win.cc rename to base/synchronization/waitable_event_watcher_win.cc
diff --git a/src/base/synchronization/waitable_event_win.cc b/base/synchronization/waitable_event_win.cc similarity index 100% rename from src/base/synchronization/waitable_event_win.cc rename to base/synchronization/waitable_event_win.cc
diff --git a/src/base/sys_byteorder.h b/base/sys_byteorder.h similarity index 100% rename from src/base/sys_byteorder.h rename to base/sys_byteorder.h
diff --git a/src/base/sys_byteorder_unittest.cc b/base/sys_byteorder_unittest.cc similarity index 100% rename from src/base/sys_byteorder_unittest.cc rename to base/sys_byteorder_unittest.cc
diff --git a/src/base/sys_info.cc b/base/sys_info.cc similarity index 100% rename from src/base/sys_info.cc rename to base/sys_info.cc
diff --git a/src/base/sys_info.h b/base/sys_info.h similarity index 100% rename from src/base/sys_info.h rename to base/sys_info.h
diff --git a/src/base/sys_info_android.cc b/base/sys_info_android.cc similarity index 100% rename from src/base/sys_info_android.cc rename to base/sys_info_android.cc
diff --git a/src/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc similarity index 100% rename from src/base/sys_info_chromeos.cc rename to base/sys_info_chromeos.cc
diff --git a/src/base/sys_info_freebsd.cc b/base/sys_info_freebsd.cc similarity index 100% rename from src/base/sys_info_freebsd.cc rename to base/sys_info_freebsd.cc
diff --git a/src/base/sys_info_fuchsia.cc b/base/sys_info_fuchsia.cc similarity index 100% rename from src/base/sys_info_fuchsia.cc rename to base/sys_info_fuchsia.cc
diff --git a/src/base/sys_info_internal.h b/base/sys_info_internal.h similarity index 100% rename from src/base/sys_info_internal.h rename to base/sys_info_internal.h
diff --git a/src/base/sys_info_ios.mm b/base/sys_info_ios.mm similarity index 100% rename from src/base/sys_info_ios.mm rename to base/sys_info_ios.mm
diff --git a/src/base/sys_info_linux.cc b/base/sys_info_linux.cc similarity index 100% rename from src/base/sys_info_linux.cc rename to base/sys_info_linux.cc
diff --git a/src/base/sys_info_mac.mm b/base/sys_info_mac.mm similarity index 100% rename from src/base/sys_info_mac.mm rename to base/sys_info_mac.mm
diff --git a/src/base/sys_info_openbsd.cc b/base/sys_info_openbsd.cc similarity index 100% rename from src/base/sys_info_openbsd.cc rename to base/sys_info_openbsd.cc
diff --git a/src/base/sys_info_posix.cc b/base/sys_info_posix.cc similarity index 100% rename from src/base/sys_info_posix.cc rename to base/sys_info_posix.cc
diff --git a/src/base/sys_info_starboard.cc b/base/sys_info_starboard.cc similarity index 100% rename from src/base/sys_info_starboard.cc rename to base/sys_info_starboard.cc
diff --git a/src/base/sys_info_unittest.cc b/base/sys_info_unittest.cc similarity index 100% rename from src/base/sys_info_unittest.cc rename to base/sys_info_unittest.cc
diff --git a/src/base/sys_info_win.cc b/base/sys_info_win.cc similarity index 100% rename from src/base/sys_info_win.cc rename to base/sys_info_win.cc
diff --git a/src/base/syslog_logging.cc b/base/syslog_logging.cc similarity index 100% rename from src/base/syslog_logging.cc rename to base/syslog_logging.cc
diff --git a/src/base/syslog_logging.h b/base/syslog_logging.h similarity index 100% rename from src/base/syslog_logging.h rename to base/syslog_logging.h
diff --git a/src/base/system/system_monitor.cc b/base/system/system_monitor.cc similarity index 100% rename from src/base/system/system_monitor.cc rename to base/system/system_monitor.cc
diff --git a/src/base/system/system_monitor.h b/base/system/system_monitor.h similarity index 100% rename from src/base/system/system_monitor.h rename to base/system/system_monitor.h
diff --git a/src/base/system/system_monitor_unittest.cc b/base/system/system_monitor_unittest.cc similarity index 100% rename from src/base/system/system_monitor_unittest.cc rename to base/system/system_monitor_unittest.cc
diff --git a/src/base/task/README.md b/base/task/README.md similarity index 100% rename from src/base/task/README.md rename to base/task/README.md
diff --git a/src/base/task/cancelable_task_tracker.cc b/base/task/cancelable_task_tracker.cc similarity index 100% rename from src/base/task/cancelable_task_tracker.cc rename to base/task/cancelable_task_tracker.cc
diff --git a/src/base/task/cancelable_task_tracker.h b/base/task/cancelable_task_tracker.h similarity index 100% rename from src/base/task/cancelable_task_tracker.h rename to base/task/cancelable_task_tracker.h
diff --git a/src/base/task/cancelable_task_tracker_unittest.cc b/base/task/cancelable_task_tracker_unittest.cc similarity index 100% rename from src/base/task/cancelable_task_tracker_unittest.cc rename to base/task/cancelable_task_tracker_unittest.cc
diff --git a/src/base/task/lazy_task_runner.cc b/base/task/lazy_task_runner.cc similarity index 100% rename from src/base/task/lazy_task_runner.cc rename to base/task/lazy_task_runner.cc
diff --git a/src/base/task/lazy_task_runner.h b/base/task/lazy_task_runner.h similarity index 100% rename from src/base/task/lazy_task_runner.h rename to base/task/lazy_task_runner.h
diff --git a/src/base/task/lazy_task_runner_unittest.cc b/base/task/lazy_task_runner_unittest.cc similarity index 100% rename from src/base/task/lazy_task_runner_unittest.cc rename to base/task/lazy_task_runner_unittest.cc
diff --git a/src/base/task/post_task.cc b/base/task/post_task.cc similarity index 100% rename from src/base/task/post_task.cc rename to base/task/post_task.cc
diff --git a/src/base/task/post_task.h b/base/task/post_task.h similarity index 100% rename from src/base/task/post_task.h rename to base/task/post_task.h
diff --git a/src/base/task/post_task_unittest.cc b/base/task/post_task_unittest.cc similarity index 100% rename from src/base/task/post_task_unittest.cc rename to base/task/post_task_unittest.cc
diff --git a/src/base/task/scoped_set_task_priority_for_current_thread.cc b/base/task/scoped_set_task_priority_for_current_thread.cc similarity index 100% rename from src/base/task/scoped_set_task_priority_for_current_thread.cc rename to base/task/scoped_set_task_priority_for_current_thread.cc
diff --git a/src/base/task/scoped_set_task_priority_for_current_thread.h b/base/task/scoped_set_task_priority_for_current_thread.h similarity index 100% rename from src/base/task/scoped_set_task_priority_for_current_thread.h rename to base/task/scoped_set_task_priority_for_current_thread.h
diff --git a/src/base/task/scoped_set_task_priority_for_current_thread_unittest.cc b/base/task/scoped_set_task_priority_for_current_thread_unittest.cc similarity index 100% rename from src/base/task/scoped_set_task_priority_for_current_thread_unittest.cc rename to base/task/scoped_set_task_priority_for_current_thread_unittest.cc
diff --git a/src/base/task/sequence_manager/associated_thread_id.h b/base/task/sequence_manager/associated_thread_id.h similarity index 100% rename from src/base/task/sequence_manager/associated_thread_id.h rename to base/task/sequence_manager/associated_thread_id.h
diff --git a/src/base/task/sequence_manager/enqueue_order.cc b/base/task/sequence_manager/enqueue_order.cc similarity index 100% rename from src/base/task/sequence_manager/enqueue_order.cc rename to base/task/sequence_manager/enqueue_order.cc
diff --git a/src/base/task/sequence_manager/enqueue_order.h b/base/task/sequence_manager/enqueue_order.h similarity index 100% rename from src/base/task/sequence_manager/enqueue_order.h rename to base/task/sequence_manager/enqueue_order.h
diff --git a/src/base/task/sequence_manager/graceful_queue_shutdown_helper.cc b/base/task/sequence_manager/graceful_queue_shutdown_helper.cc similarity index 100% rename from src/base/task/sequence_manager/graceful_queue_shutdown_helper.cc rename to base/task/sequence_manager/graceful_queue_shutdown_helper.cc
diff --git a/src/base/task/sequence_manager/graceful_queue_shutdown_helper.h b/base/task/sequence_manager/graceful_queue_shutdown_helper.h similarity index 100% rename from src/base/task/sequence_manager/graceful_queue_shutdown_helper.h rename to base/task/sequence_manager/graceful_queue_shutdown_helper.h
diff --git a/src/base/task/sequence_manager/intrusive_heap.h b/base/task/sequence_manager/intrusive_heap.h similarity index 100% rename from src/base/task/sequence_manager/intrusive_heap.h rename to base/task/sequence_manager/intrusive_heap.h
diff --git a/src/base/task/sequence_manager/intrusive_heap_unittest.cc b/base/task/sequence_manager/intrusive_heap_unittest.cc similarity index 100% rename from src/base/task/sequence_manager/intrusive_heap_unittest.cc rename to base/task/sequence_manager/intrusive_heap_unittest.cc
diff --git a/src/base/task/sequence_manager/lazily_deallocated_deque.h b/base/task/sequence_manager/lazily_deallocated_deque.h similarity index 100% rename from src/base/task/sequence_manager/lazily_deallocated_deque.h rename to base/task/sequence_manager/lazily_deallocated_deque.h
diff --git a/src/base/task/sequence_manager/lazily_deallocated_deque_unittest.cc b/base/task/sequence_manager/lazily_deallocated_deque_unittest.cc similarity index 100% rename from src/base/task/sequence_manager/lazily_deallocated_deque_unittest.cc rename to base/task/sequence_manager/lazily_deallocated_deque_unittest.cc
diff --git a/src/base/task/sequence_manager/lazy_now.cc b/base/task/sequence_manager/lazy_now.cc similarity index 100% rename from src/base/task/sequence_manager/lazy_now.cc rename to base/task/sequence_manager/lazy_now.cc
diff --git a/src/base/task/sequence_manager/lazy_now.h b/base/task/sequence_manager/lazy_now.h similarity index 100% rename from src/base/task/sequence_manager/lazy_now.h rename to base/task/sequence_manager/lazy_now.h
diff --git a/src/base/task/sequence_manager/moveable_auto_lock.h b/base/task/sequence_manager/moveable_auto_lock.h similarity index 100% rename from src/base/task/sequence_manager/moveable_auto_lock.h rename to base/task/sequence_manager/moveable_auto_lock.h
diff --git a/src/base/task/sequence_manager/real_time_domain.cc b/base/task/sequence_manager/real_time_domain.cc similarity index 100% rename from src/base/task/sequence_manager/real_time_domain.cc rename to base/task/sequence_manager/real_time_domain.cc
diff --git a/src/base/task/sequence_manager/real_time_domain.h b/base/task/sequence_manager/real_time_domain.h similarity index 100% rename from src/base/task/sequence_manager/real_time_domain.h rename to base/task/sequence_manager/real_time_domain.h
diff --git a/src/base/task/sequence_manager/sequence_manager.cc b/base/task/sequence_manager/sequence_manager.cc similarity index 100% rename from src/base/task/sequence_manager/sequence_manager.cc rename to base/task/sequence_manager/sequence_manager.cc
diff --git a/src/base/task/sequence_manager/sequence_manager.h b/base/task/sequence_manager/sequence_manager.h similarity index 100% rename from src/base/task/sequence_manager/sequence_manager.h rename to base/task/sequence_manager/sequence_manager.h
diff --git a/src/base/task/sequence_manager/sequence_manager_impl.cc b/base/task/sequence_manager/sequence_manager_impl.cc similarity index 100% rename from src/base/task/sequence_manager/sequence_manager_impl.cc rename to base/task/sequence_manager/sequence_manager_impl.cc
diff --git a/src/base/task/sequence_manager/sequence_manager_impl.h b/base/task/sequence_manager/sequence_manager_impl.h similarity index 100% rename from src/base/task/sequence_manager/sequence_manager_impl.h rename to base/task/sequence_manager/sequence_manager_impl.h
diff --git a/src/base/task/sequence_manager/sequence_manager_impl_unittest.cc b/base/task/sequence_manager/sequence_manager_impl_unittest.cc similarity index 100% rename from src/base/task/sequence_manager/sequence_manager_impl_unittest.cc rename to base/task/sequence_manager/sequence_manager_impl_unittest.cc
diff --git a/src/base/task/sequence_manager/sequence_manager_perftest.cc b/base/task/sequence_manager/sequence_manager_perftest.cc similarity index 100% rename from src/base/task/sequence_manager/sequence_manager_perftest.cc rename to base/task/sequence_manager/sequence_manager_perftest.cc
diff --git a/src/base/task/sequence_manager/sequenced_task_source.h b/base/task/sequence_manager/sequenced_task_source.h similarity index 100% rename from src/base/task/sequence_manager/sequenced_task_source.h rename to base/task/sequence_manager/sequenced_task_source.h
diff --git a/src/base/task/sequence_manager/task_queue.cc b/base/task/sequence_manager/task_queue.cc similarity index 100% rename from src/base/task/sequence_manager/task_queue.cc rename to base/task/sequence_manager/task_queue.cc
diff --git a/src/base/task/sequence_manager/task_queue.h b/base/task/sequence_manager/task_queue.h similarity index 100% rename from src/base/task/sequence_manager/task_queue.h rename to base/task/sequence_manager/task_queue.h
diff --git a/src/base/task/sequence_manager/task_queue_impl.cc b/base/task/sequence_manager/task_queue_impl.cc similarity index 100% rename from src/base/task/sequence_manager/task_queue_impl.cc rename to base/task/sequence_manager/task_queue_impl.cc
diff --git a/src/base/task/sequence_manager/task_queue_impl.h b/base/task/sequence_manager/task_queue_impl.h similarity index 100% rename from src/base/task/sequence_manager/task_queue_impl.h rename to base/task/sequence_manager/task_queue_impl.h
diff --git a/src/base/task/sequence_manager/task_queue_proxy.cc b/base/task/sequence_manager/task_queue_proxy.cc similarity index 100% rename from src/base/task/sequence_manager/task_queue_proxy.cc rename to base/task/sequence_manager/task_queue_proxy.cc
diff --git a/src/base/task/sequence_manager/task_queue_proxy.h b/base/task/sequence_manager/task_queue_proxy.h similarity index 100% rename from src/base/task/sequence_manager/task_queue_proxy.h rename to base/task/sequence_manager/task_queue_proxy.h
diff --git a/src/base/task/sequence_manager/task_queue_selector.cc b/base/task/sequence_manager/task_queue_selector.cc similarity index 100% rename from src/base/task/sequence_manager/task_queue_selector.cc rename to base/task/sequence_manager/task_queue_selector.cc
diff --git a/src/base/task/sequence_manager/task_queue_selector.h b/base/task/sequence_manager/task_queue_selector.h similarity index 100% rename from src/base/task/sequence_manager/task_queue_selector.h rename to base/task/sequence_manager/task_queue_selector.h
diff --git a/src/base/task/sequence_manager/task_queue_selector_logic.h b/base/task/sequence_manager/task_queue_selector_logic.h similarity index 100% rename from src/base/task/sequence_manager/task_queue_selector_logic.h rename to base/task/sequence_manager/task_queue_selector_logic.h
diff --git a/src/base/task/sequence_manager/task_queue_selector_unittest.cc b/base/task/sequence_manager/task_queue_selector_unittest.cc similarity index 100% rename from src/base/task/sequence_manager/task_queue_selector_unittest.cc rename to base/task/sequence_manager/task_queue_selector_unittest.cc
diff --git a/src/base/task/sequence_manager/task_queue_task_runner.cc b/base/task/sequence_manager/task_queue_task_runner.cc similarity index 100% rename from src/base/task/sequence_manager/task_queue_task_runner.cc rename to base/task/sequence_manager/task_queue_task_runner.cc
diff --git a/src/base/task/sequence_manager/task_queue_task_runner.h b/base/task/sequence_manager/task_queue_task_runner.h similarity index 100% rename from src/base/task/sequence_manager/task_queue_task_runner.h rename to base/task/sequence_manager/task_queue_task_runner.h
diff --git a/src/base/task/sequence_manager/task_time_observer.h b/base/task/sequence_manager/task_time_observer.h similarity index 100% rename from src/base/task/sequence_manager/task_time_observer.h rename to base/task/sequence_manager/task_time_observer.h
diff --git a/src/base/task/sequence_manager/tasks.cc b/base/task/sequence_manager/tasks.cc similarity index 100% rename from src/base/task/sequence_manager/tasks.cc rename to base/task/sequence_manager/tasks.cc
diff --git a/src/base/task/sequence_manager/tasks.h b/base/task/sequence_manager/tasks.h similarity index 100% rename from src/base/task/sequence_manager/tasks.h rename to base/task/sequence_manager/tasks.h
diff --git a/src/base/task/sequence_manager/test/fake_task.cc b/base/task/sequence_manager/test/fake_task.cc similarity index 100% rename from src/base/task/sequence_manager/test/fake_task.cc rename to base/task/sequence_manager/test/fake_task.cc
diff --git a/src/base/task/sequence_manager/test/fake_task.h b/base/task/sequence_manager/test/fake_task.h similarity index 100% rename from src/base/task/sequence_manager/test/fake_task.h rename to base/task/sequence_manager/test/fake_task.h
diff --git a/src/base/task/sequence_manager/test/lazy_thread_controller_for_test.cc b/base/task/sequence_manager/test/lazy_thread_controller_for_test.cc similarity index 100% rename from src/base/task/sequence_manager/test/lazy_thread_controller_for_test.cc rename to base/task/sequence_manager/test/lazy_thread_controller_for_test.cc
diff --git a/src/base/task/sequence_manager/test/lazy_thread_controller_for_test.h b/base/task/sequence_manager/test/lazy_thread_controller_for_test.h similarity index 100% rename from src/base/task/sequence_manager/test/lazy_thread_controller_for_test.h rename to base/task/sequence_manager/test/lazy_thread_controller_for_test.h
diff --git a/src/base/task/sequence_manager/test/mock_time_domain.cc b/base/task/sequence_manager/test/mock_time_domain.cc similarity index 100% rename from src/base/task/sequence_manager/test/mock_time_domain.cc rename to base/task/sequence_manager/test/mock_time_domain.cc
diff --git a/src/base/task/sequence_manager/test/mock_time_domain.h b/base/task/sequence_manager/test/mock_time_domain.h similarity index 100% rename from src/base/task/sequence_manager/test/mock_time_domain.h rename to base/task/sequence_manager/test/mock_time_domain.h
diff --git a/src/base/task/sequence_manager/test/sequence_manager_for_test.cc b/base/task/sequence_manager/test/sequence_manager_for_test.cc similarity index 100% rename from src/base/task/sequence_manager/test/sequence_manager_for_test.cc rename to base/task/sequence_manager/test/sequence_manager_for_test.cc
diff --git a/src/base/task/sequence_manager/test/sequence_manager_for_test.h b/base/task/sequence_manager/test/sequence_manager_for_test.h similarity index 100% rename from src/base/task/sequence_manager/test/sequence_manager_for_test.h rename to base/task/sequence_manager/test/sequence_manager_for_test.h
diff --git a/src/base/task/sequence_manager/test/test_task_queue.cc b/base/task/sequence_manager/test/test_task_queue.cc similarity index 100% rename from src/base/task/sequence_manager/test/test_task_queue.cc rename to base/task/sequence_manager/test/test_task_queue.cc
diff --git a/src/base/task/sequence_manager/test/test_task_queue.h b/base/task/sequence_manager/test/test_task_queue.h similarity index 100% rename from src/base/task/sequence_manager/test/test_task_queue.h rename to base/task/sequence_manager/test/test_task_queue.h
diff --git a/src/base/task/sequence_manager/test/test_task_time_observer.h b/base/task/sequence_manager/test/test_task_time_observer.h similarity index 100% rename from src/base/task/sequence_manager/test/test_task_time_observer.h rename to base/task/sequence_manager/test/test_task_time_observer.h
diff --git a/src/base/task/sequence_manager/thread_controller.h b/base/task/sequence_manager/thread_controller.h similarity index 100% rename from src/base/task/sequence_manager/thread_controller.h rename to base/task/sequence_manager/thread_controller.h
diff --git a/src/base/task/sequence_manager/thread_controller_impl.cc b/base/task/sequence_manager/thread_controller_impl.cc similarity index 100% rename from src/base/task/sequence_manager/thread_controller_impl.cc rename to base/task/sequence_manager/thread_controller_impl.cc
diff --git a/src/base/task/sequence_manager/thread_controller_impl.h b/base/task/sequence_manager/thread_controller_impl.h similarity index 100% rename from src/base/task/sequence_manager/thread_controller_impl.h rename to base/task/sequence_manager/thread_controller_impl.h
diff --git a/src/base/task/sequence_manager/thread_controller_with_message_pump_impl.cc b/base/task/sequence_manager/thread_controller_with_message_pump_impl.cc similarity index 100% rename from src/base/task/sequence_manager/thread_controller_with_message_pump_impl.cc rename to base/task/sequence_manager/thread_controller_with_message_pump_impl.cc
diff --git a/src/base/task/sequence_manager/thread_controller_with_message_pump_impl.h b/base/task/sequence_manager/thread_controller_with_message_pump_impl.h similarity index 100% rename from src/base/task/sequence_manager/thread_controller_with_message_pump_impl.h rename to base/task/sequence_manager/thread_controller_with_message_pump_impl.h
diff --git a/src/base/task/sequence_manager/time_domain.cc b/base/task/sequence_manager/time_domain.cc similarity index 100% rename from src/base/task/sequence_manager/time_domain.cc rename to base/task/sequence_manager/time_domain.cc
diff --git a/src/base/task/sequence_manager/time_domain.h b/base/task/sequence_manager/time_domain.h similarity index 100% rename from src/base/task/sequence_manager/time_domain.h rename to base/task/sequence_manager/time_domain.h
diff --git a/src/base/task/sequence_manager/time_domain_unittest.cc b/base/task/sequence_manager/time_domain_unittest.cc similarity index 100% rename from src/base/task/sequence_manager/time_domain_unittest.cc rename to base/task/sequence_manager/time_domain_unittest.cc
diff --git a/src/base/task/sequence_manager/work_queue.cc b/base/task/sequence_manager/work_queue.cc similarity index 100% rename from src/base/task/sequence_manager/work_queue.cc rename to base/task/sequence_manager/work_queue.cc
diff --git a/src/base/task/sequence_manager/work_queue.h b/base/task/sequence_manager/work_queue.h similarity index 100% rename from src/base/task/sequence_manager/work_queue.h rename to base/task/sequence_manager/work_queue.h
diff --git a/src/base/task/sequence_manager/work_queue_sets.cc b/base/task/sequence_manager/work_queue_sets.cc similarity index 100% rename from src/base/task/sequence_manager/work_queue_sets.cc rename to base/task/sequence_manager/work_queue_sets.cc
diff --git a/src/base/task/sequence_manager/work_queue_sets.h b/base/task/sequence_manager/work_queue_sets.h similarity index 100% rename from src/base/task/sequence_manager/work_queue_sets.h rename to base/task/sequence_manager/work_queue_sets.h
diff --git a/src/base/task/sequence_manager/work_queue_sets_unittest.cc b/base/task/sequence_manager/work_queue_sets_unittest.cc similarity index 100% rename from src/base/task/sequence_manager/work_queue_sets_unittest.cc rename to base/task/sequence_manager/work_queue_sets_unittest.cc
diff --git a/src/base/task/sequence_manager/work_queue_unittest.cc b/base/task/sequence_manager/work_queue_unittest.cc similarity index 100% rename from src/base/task/sequence_manager/work_queue_unittest.cc rename to base/task/sequence_manager/work_queue_unittest.cc
diff --git a/src/base/task/single_thread_task_runner_thread_mode.h b/base/task/single_thread_task_runner_thread_mode.h similarity index 100% rename from src/base/task/single_thread_task_runner_thread_mode.h rename to base/task/single_thread_task_runner_thread_mode.h
diff --git a/src/base/task/task_executor.cc b/base/task/task_executor.cc similarity index 100% rename from src/base/task/task_executor.cc rename to base/task/task_executor.cc
diff --git a/src/base/task/task_executor.h b/base/task/task_executor.h similarity index 100% rename from src/base/task/task_executor.h rename to base/task/task_executor.h
diff --git a/src/base/task/task_scheduler/can_schedule_sequence_observer.h b/base/task/task_scheduler/can_schedule_sequence_observer.h similarity index 100% rename from src/base/task/task_scheduler/can_schedule_sequence_observer.h rename to base/task/task_scheduler/can_schedule_sequence_observer.h
diff --git a/src/base/task/task_scheduler/delayed_task_manager.cc b/base/task/task_scheduler/delayed_task_manager.cc similarity index 100% rename from src/base/task/task_scheduler/delayed_task_manager.cc rename to base/task/task_scheduler/delayed_task_manager.cc
diff --git a/src/base/task/task_scheduler/delayed_task_manager.h b/base/task/task_scheduler/delayed_task_manager.h similarity index 100% rename from src/base/task/task_scheduler/delayed_task_manager.h rename to base/task/task_scheduler/delayed_task_manager.h
diff --git a/src/base/task/task_scheduler/delayed_task_manager_unittest.cc b/base/task/task_scheduler/delayed_task_manager_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/delayed_task_manager_unittest.cc rename to base/task/task_scheduler/delayed_task_manager_unittest.cc
diff --git a/src/base/task/task_scheduler/environment_config.cc b/base/task/task_scheduler/environment_config.cc similarity index 100% rename from src/base/task/task_scheduler/environment_config.cc rename to base/task/task_scheduler/environment_config.cc
diff --git a/src/base/task/task_scheduler/environment_config.h b/base/task/task_scheduler/environment_config.h similarity index 100% rename from src/base/task/task_scheduler/environment_config.h rename to base/task/task_scheduler/environment_config.h
diff --git a/src/base/task/task_scheduler/initialization_util.cc b/base/task/task_scheduler/initialization_util.cc similarity index 100% rename from src/base/task/task_scheduler/initialization_util.cc rename to base/task/task_scheduler/initialization_util.cc
diff --git a/src/base/task/task_scheduler/initialization_util.h b/base/task/task_scheduler/initialization_util.h similarity index 100% rename from src/base/task/task_scheduler/initialization_util.h rename to base/task/task_scheduler/initialization_util.h
diff --git a/src/base/task/task_scheduler/platform_native_worker_pool_win.cc b/base/task/task_scheduler/platform_native_worker_pool_win.cc similarity index 100% rename from src/base/task/task_scheduler/platform_native_worker_pool_win.cc rename to base/task/task_scheduler/platform_native_worker_pool_win.cc
diff --git a/src/base/task/task_scheduler/platform_native_worker_pool_win.h b/base/task/task_scheduler/platform_native_worker_pool_win.h similarity index 100% rename from src/base/task/task_scheduler/platform_native_worker_pool_win.h rename to base/task/task_scheduler/platform_native_worker_pool_win.h
diff --git a/src/base/task/task_scheduler/priority_queue.cc b/base/task/task_scheduler/priority_queue.cc similarity index 100% rename from src/base/task/task_scheduler/priority_queue.cc rename to base/task/task_scheduler/priority_queue.cc
diff --git a/src/base/task/task_scheduler/priority_queue.h b/base/task/task_scheduler/priority_queue.h similarity index 100% rename from src/base/task/task_scheduler/priority_queue.h rename to base/task/task_scheduler/priority_queue.h
diff --git a/src/base/task/task_scheduler/priority_queue_unittest.cc b/base/task/task_scheduler/priority_queue_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/priority_queue_unittest.cc rename to base/task/task_scheduler/priority_queue_unittest.cc
diff --git a/src/base/task/task_scheduler/scheduler_lock.h b/base/task/task_scheduler/scheduler_lock.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_lock.h rename to base/task/task_scheduler/scheduler_lock.h
diff --git a/src/base/task/task_scheduler/scheduler_lock_impl.cc b/base/task/task_scheduler/scheduler_lock_impl.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_lock_impl.cc rename to base/task/task_scheduler/scheduler_lock_impl.cc
diff --git a/src/base/task/task_scheduler/scheduler_lock_impl.h b/base/task/task_scheduler/scheduler_lock_impl.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_lock_impl.h rename to base/task/task_scheduler/scheduler_lock_impl.h
diff --git a/src/base/task/task_scheduler/scheduler_lock_unittest.cc b/base/task/task_scheduler/scheduler_lock_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_lock_unittest.cc rename to base/task/task_scheduler/scheduler_lock_unittest.cc
diff --git a/src/base/task/task_scheduler/scheduler_single_thread_task_runner_manager.cc b/base/task/task_scheduler/scheduler_single_thread_task_runner_manager.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_single_thread_task_runner_manager.cc rename to base/task/task_scheduler/scheduler_single_thread_task_runner_manager.cc
diff --git a/src/base/task/task_scheduler/scheduler_single_thread_task_runner_manager.h b/base/task/task_scheduler/scheduler_single_thread_task_runner_manager.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_single_thread_task_runner_manager.h rename to base/task/task_scheduler/scheduler_single_thread_task_runner_manager.h
diff --git a/src/base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc b/base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc rename to base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker.cc b/base/task/task_scheduler/scheduler_worker.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker.cc rename to base/task/task_scheduler/scheduler_worker.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker.h b/base/task/task_scheduler/scheduler_worker.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker.h rename to base/task/task_scheduler/scheduler_worker.h
diff --git a/src/base/task/task_scheduler/scheduler_worker_observer.h b/base/task/task_scheduler/scheduler_worker_observer.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_observer.h rename to base/task/task_scheduler/scheduler_worker_observer.h
diff --git a/src/base/task/task_scheduler/scheduler_worker_params.h b/base/task/task_scheduler/scheduler_worker_params.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_params.h rename to base/task/task_scheduler/scheduler_worker_params.h
diff --git a/src/base/task/task_scheduler/scheduler_worker_pool.cc b/base/task/task_scheduler/scheduler_worker_pool.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_pool.cc rename to base/task/task_scheduler/scheduler_worker_pool.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker_pool.h b/base/task/task_scheduler/scheduler_worker_pool.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_pool.h rename to base/task/task_scheduler/scheduler_worker_pool.h
diff --git a/src/base/task/task_scheduler/scheduler_worker_pool_impl.cc b/base/task/task_scheduler/scheduler_worker_pool_impl.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_pool_impl.cc rename to base/task/task_scheduler/scheduler_worker_pool_impl.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker_pool_impl.h b/base/task/task_scheduler/scheduler_worker_pool_impl.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_pool_impl.h rename to base/task/task_scheduler/scheduler_worker_pool_impl.h
diff --git a/src/base/task/task_scheduler/scheduler_worker_pool_impl_unittest.cc b/base/task/task_scheduler/scheduler_worker_pool_impl_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_pool_impl_unittest.cc rename to base/task/task_scheduler/scheduler_worker_pool_impl_unittest.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker_pool_params.cc b/base/task/task_scheduler/scheduler_worker_pool_params.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_pool_params.cc rename to base/task/task_scheduler/scheduler_worker_pool_params.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker_pool_params.h b/base/task/task_scheduler/scheduler_worker_pool_params.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_pool_params.h rename to base/task/task_scheduler/scheduler_worker_pool_params.h
diff --git a/src/base/task/task_scheduler/scheduler_worker_pool_unittest.cc b/base/task/task_scheduler/scheduler_worker_pool_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_pool_unittest.cc rename to base/task/task_scheduler/scheduler_worker_pool_unittest.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker_stack.cc b/base/task/task_scheduler/scheduler_worker_stack.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_stack.cc rename to base/task/task_scheduler/scheduler_worker_stack.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker_stack.h b/base/task/task_scheduler/scheduler_worker_stack.h similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_stack.h rename to base/task/task_scheduler/scheduler_worker_stack.h
diff --git a/src/base/task/task_scheduler/scheduler_worker_stack_unittest.cc b/base/task/task_scheduler/scheduler_worker_stack_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_stack_unittest.cc rename to base/task/task_scheduler/scheduler_worker_stack_unittest.cc
diff --git a/src/base/task/task_scheduler/scheduler_worker_unittest.cc b/base/task/task_scheduler/scheduler_worker_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/scheduler_worker_unittest.cc rename to base/task/task_scheduler/scheduler_worker_unittest.cc
diff --git a/src/base/task/task_scheduler/sequence.cc b/base/task/task_scheduler/sequence.cc similarity index 100% rename from src/base/task/task_scheduler/sequence.cc rename to base/task/task_scheduler/sequence.cc
diff --git a/src/base/task/task_scheduler/sequence.h b/base/task/task_scheduler/sequence.h similarity index 100% rename from src/base/task/task_scheduler/sequence.h rename to base/task/task_scheduler/sequence.h
diff --git a/src/base/task/task_scheduler/sequence_sort_key.cc b/base/task/task_scheduler/sequence_sort_key.cc similarity index 100% rename from src/base/task/task_scheduler/sequence_sort_key.cc rename to base/task/task_scheduler/sequence_sort_key.cc
diff --git a/src/base/task/task_scheduler/sequence_sort_key.h b/base/task/task_scheduler/sequence_sort_key.h similarity index 100% rename from src/base/task/task_scheduler/sequence_sort_key.h rename to base/task/task_scheduler/sequence_sort_key.h
diff --git a/src/base/task/task_scheduler/sequence_sort_key_unittest.cc b/base/task/task_scheduler/sequence_sort_key_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/sequence_sort_key_unittest.cc rename to base/task/task_scheduler/sequence_sort_key_unittest.cc
diff --git a/src/base/task/task_scheduler/sequence_unittest.cc b/base/task/task_scheduler/sequence_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/sequence_unittest.cc rename to base/task/task_scheduler/sequence_unittest.cc
diff --git a/src/base/task/task_scheduler/service_thread.cc b/base/task/task_scheduler/service_thread.cc similarity index 100% rename from src/base/task/task_scheduler/service_thread.cc rename to base/task/task_scheduler/service_thread.cc
diff --git a/src/base/task/task_scheduler/service_thread.h b/base/task/task_scheduler/service_thread.h similarity index 100% rename from src/base/task/task_scheduler/service_thread.h rename to base/task/task_scheduler/service_thread.h
diff --git a/src/base/task/task_scheduler/service_thread_unittest.cc b/base/task/task_scheduler/service_thread_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/service_thread_unittest.cc rename to base/task/task_scheduler/service_thread_unittest.cc
diff --git a/src/base/task/task_scheduler/single_thread_task_runner_thread_mode.h b/base/task/task_scheduler/single_thread_task_runner_thread_mode.h similarity index 100% rename from src/base/task/task_scheduler/single_thread_task_runner_thread_mode.h rename to base/task/task_scheduler/single_thread_task_runner_thread_mode.h
diff --git a/src/base/task/task_scheduler/task.cc b/base/task/task_scheduler/task.cc similarity index 100% rename from src/base/task/task_scheduler/task.cc rename to base/task/task_scheduler/task.cc
diff --git a/src/base/task/task_scheduler/task.h b/base/task/task_scheduler/task.h similarity index 100% rename from src/base/task/task_scheduler/task.h rename to base/task/task_scheduler/task.h
diff --git a/src/base/task/task_scheduler/task_scheduler.cc b/base/task/task_scheduler/task_scheduler.cc similarity index 100% rename from src/base/task/task_scheduler/task_scheduler.cc rename to base/task/task_scheduler/task_scheduler.cc
diff --git a/src/base/task/task_scheduler/task_scheduler.h b/base/task/task_scheduler/task_scheduler.h similarity index 100% rename from src/base/task/task_scheduler/task_scheduler.h rename to base/task/task_scheduler/task_scheduler.h
diff --git a/src/base/task/task_scheduler/task_scheduler_impl.cc b/base/task/task_scheduler/task_scheduler_impl.cc similarity index 100% rename from src/base/task/task_scheduler/task_scheduler_impl.cc rename to base/task/task_scheduler/task_scheduler_impl.cc
diff --git a/src/base/task/task_scheduler/task_scheduler_impl.h b/base/task/task_scheduler/task_scheduler_impl.h similarity index 100% rename from src/base/task/task_scheduler/task_scheduler_impl.h rename to base/task/task_scheduler/task_scheduler_impl.h
diff --git a/src/base/task/task_scheduler/task_scheduler_impl_unittest.cc b/base/task/task_scheduler/task_scheduler_impl_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/task_scheduler_impl_unittest.cc rename to base/task/task_scheduler/task_scheduler_impl_unittest.cc
diff --git a/src/base/task/task_scheduler/task_tracker.cc b/base/task/task_scheduler/task_tracker.cc similarity index 100% rename from src/base/task/task_scheduler/task_tracker.cc rename to base/task/task_scheduler/task_tracker.cc
diff --git a/src/base/task/task_scheduler/task_tracker.h b/base/task/task_scheduler/task_tracker.h similarity index 100% rename from src/base/task/task_scheduler/task_tracker.h rename to base/task/task_scheduler/task_tracker.h
diff --git a/src/base/task/task_scheduler/task_tracker_posix.cc b/base/task/task_scheduler/task_tracker_posix.cc similarity index 100% rename from src/base/task/task_scheduler/task_tracker_posix.cc rename to base/task/task_scheduler/task_tracker_posix.cc
diff --git a/src/base/task/task_scheduler/task_tracker_posix.h b/base/task/task_scheduler/task_tracker_posix.h similarity index 100% rename from src/base/task/task_scheduler/task_tracker_posix.h rename to base/task/task_scheduler/task_tracker_posix.h
diff --git a/src/base/task/task_scheduler/task_tracker_posix_unittest.cc b/base/task/task_scheduler/task_tracker_posix_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/task_tracker_posix_unittest.cc rename to base/task/task_scheduler/task_tracker_posix_unittest.cc
diff --git a/src/base/task/task_scheduler/task_tracker_unittest.cc b/base/task/task_scheduler/task_tracker_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/task_tracker_unittest.cc rename to base/task/task_scheduler/task_tracker_unittest.cc
diff --git a/src/base/task/task_scheduler/test_task_factory.cc b/base/task/task_scheduler/test_task_factory.cc similarity index 100% rename from src/base/task/task_scheduler/test_task_factory.cc rename to base/task/task_scheduler/test_task_factory.cc
diff --git a/src/base/task/task_scheduler/test_task_factory.h b/base/task/task_scheduler/test_task_factory.h similarity index 100% rename from src/base/task/task_scheduler/test_task_factory.h rename to base/task/task_scheduler/test_task_factory.h
diff --git a/src/base/task/task_scheduler/test_utils.cc b/base/task/task_scheduler/test_utils.cc similarity index 100% rename from src/base/task/task_scheduler/test_utils.cc rename to base/task/task_scheduler/test_utils.cc
diff --git a/src/base/task/task_scheduler/test_utils.h b/base/task/task_scheduler/test_utils.h similarity index 100% rename from src/base/task/task_scheduler/test_utils.h rename to base/task/task_scheduler/test_utils.h
diff --git a/src/base/task/task_scheduler/tracked_ref.h b/base/task/task_scheduler/tracked_ref.h similarity index 100% rename from src/base/task/task_scheduler/tracked_ref.h rename to base/task/task_scheduler/tracked_ref.h
diff --git a/src/base/task/task_scheduler/tracked_ref_unittest.cc b/base/task/task_scheduler/tracked_ref_unittest.cc similarity index 100% rename from src/base/task/task_scheduler/tracked_ref_unittest.cc rename to base/task/task_scheduler/tracked_ref_unittest.cc
diff --git a/src/base/task/task_traits.cc b/base/task/task_traits.cc similarity index 100% rename from src/base/task/task_traits.cc rename to base/task/task_traits.cc
diff --git a/src/base/task/task_traits.h b/base/task/task_traits.h similarity index 100% rename from src/base/task/task_traits.h rename to base/task/task_traits.h
diff --git a/src/base/task/task_traits_details.h b/base/task/task_traits_details.h similarity index 100% rename from src/base/task/task_traits_details.h rename to base/task/task_traits_details.h
diff --git a/src/base/task/task_traits_extension.h b/base/task/task_traits_extension.h similarity index 100% rename from src/base/task/task_traits_extension.h rename to base/task/task_traits_extension.h
diff --git a/src/base/task/task_traits_extension_unittest.cc b/base/task/task_traits_extension_unittest.cc similarity index 100% rename from src/base/task/task_traits_extension_unittest.cc rename to base/task/task_traits_extension_unittest.cc
diff --git a/src/base/task/task_traits_extension_unittest.nc b/base/task/task_traits_extension_unittest.nc similarity index 100% rename from src/base/task/task_traits_extension_unittest.nc rename to base/task/task_traits_extension_unittest.nc
diff --git a/src/base/task/task_traits_unittest.cc b/base/task/task_traits_unittest.cc similarity index 100% rename from src/base/task/task_traits_unittest.cc rename to base/task/task_traits_unittest.cc
diff --git a/src/base/task/task_traits_unittest.nc b/base/task/task_traits_unittest.nc similarity index 100% rename from src/base/task/task_traits_unittest.nc rename to base/task/task_traits_unittest.nc
diff --git a/src/base/task/test_task_traits_extension.cc b/base/task/test_task_traits_extension.cc similarity index 100% rename from src/base/task/test_task_traits_extension.cc rename to base/task/test_task_traits_extension.cc
diff --git a/src/base/task/test_task_traits_extension.h b/base/task/test_task_traits_extension.h similarity index 100% rename from src/base/task/test_task_traits_extension.h rename to base/task/test_task_traits_extension.h
diff --git a/src/base/task_runner.cc b/base/task_runner.cc similarity index 100% rename from src/base/task_runner.cc rename to base/task_runner.cc
diff --git a/src/base/task_runner.h b/base/task_runner.h similarity index 100% rename from src/base/task_runner.h rename to base/task_runner.h
diff --git a/src/base/task_runner_util.h b/base/task_runner_util.h similarity index 100% rename from src/base/task_runner_util.h rename to base/task_runner_util.h
diff --git a/src/base/task_runner_util_unittest.cc b/base/task_runner_util_unittest.cc similarity index 100% rename from src/base/task_runner_util_unittest.cc rename to base/task_runner_util_unittest.cc
diff --git a/src/base/template_util.h b/base/template_util.h similarity index 100% rename from src/base/template_util.h rename to base/template_util.h
diff --git a/src/base/template_util_unittest.cc b/base/template_util_unittest.cc similarity index 100% rename from src/base/template_util_unittest.cc rename to base/template_util_unittest.cc
diff --git a/src/base/test/BUILD.gn b/base/test/BUILD.gn similarity index 100% rename from src/base/test/BUILD.gn rename to base/test/BUILD.gn
diff --git a/src/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java b/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java rename to base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java
diff --git a/src/base/test/android/java/src/org/chromium/base/ITestCallback.aidl b/base/test/android/java/src/org/chromium/base/ITestCallback.aidl similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/ITestCallback.aidl rename to base/test/android/java/src/org/chromium/base/ITestCallback.aidl
diff --git a/src/base/test/android/java/src/org/chromium/base/ITestController.aidl b/base/test/android/java/src/org/chromium/base/ITestController.aidl similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/ITestController.aidl rename to base/test/android/java/src/org/chromium/base/ITestController.aidl
diff --git a/src/base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java b/base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java rename to base/test/android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java b/base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java rename to base/test/android/java/src/org/chromium/base/MainReturnCodeResult.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java rename to base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java rename to base/test/android/java/src/org/chromium/base/MultiprocessTestClientService.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService0.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService0.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService0.java rename to base/test/android/java/src/org/chromium/base/MultiprocessTestClientService0.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService1.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService1.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService1.java rename to base/test/android/java/src/org/chromium/base/MultiprocessTestClientService1.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService2.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService2.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService2.java rename to base/test/android/java/src/org/chromium/base/MultiprocessTestClientService2.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService3.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService3.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService3.java rename to base/test/android/java/src/org/chromium/base/MultiprocessTestClientService3.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService4.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService4.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientService4.java rename to base/test/android/java/src/org/chromium/base/MultiprocessTestClientService4.java
diff --git a/src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientServiceDelegate.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientServiceDelegate.java similarity index 100% rename from src/base/test/android/java/src/org/chromium/base/MultiprocessTestClientServiceDelegate.java rename to base/test/android/java/src/org/chromium/base/MultiprocessTestClientServiceDelegate.java
diff --git a/src/base/test/android/java_handler_thread_helpers.cc b/base/test/android/java_handler_thread_helpers.cc similarity index 100% rename from src/base/test/android/java_handler_thread_helpers.cc rename to base/test/android/java_handler_thread_helpers.cc
diff --git a/src/base/test/android/java_handler_thread_helpers.h b/base/test/android/java_handler_thread_helpers.h similarity index 100% rename from src/base/test/android/java_handler_thread_helpers.h rename to base/test/android/java_handler_thread_helpers.h
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java rename to base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java rename to base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java rename to base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java b/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java rename to base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java b/base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java rename to base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/SetUpStatement.java b/base/test/android/javatests/src/org/chromium/base/test/SetUpStatement.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/SetUpStatement.java rename to base/test/android/javatests/src/org/chromium/base/test/SetUpStatement.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/SetUpTestRule.java b/base/test/android/javatests/src/org/chromium/base/test/SetUpTestRule.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/SetUpTestRule.java rename to base/test/android/javatests/src/org/chromium/base/test/SetUpTestRule.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/TestChildProcessConnection.java b/base/test/android/javatests/src/org/chromium/base/test/TestChildProcessConnection.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/TestChildProcessConnection.java rename to base/test/android/javatests/src/org/chromium/base/test/TestChildProcessConnection.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/TestListInstrumentationRunListener.java b/base/test/android/javatests/src/org/chromium/base/test/TestListInstrumentationRunListener.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/TestListInstrumentationRunListener.java rename to base/test/android/javatests/src/org/chromium/base/test/TestListInstrumentationRunListener.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/TestTraceEvent.java b/base/test/android/javatests/src/org/chromium/base/test/TestTraceEvent.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/TestTraceEvent.java rename to base/test/android/javatests/src/org/chromium/base/test/TestTraceEvent.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/BaseJUnit4RunnerDelegate.java b/base/test/android/javatests/src/org/chromium/base/test/params/BaseJUnit4RunnerDelegate.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/BaseJUnit4RunnerDelegate.java rename to base/test/android/javatests/src/org/chromium/base/test/params/BaseJUnit4RunnerDelegate.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/BlockJUnit4RunnerDelegate.java b/base/test/android/javatests/src/org/chromium/base/test/params/BlockJUnit4RunnerDelegate.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/BlockJUnit4RunnerDelegate.java rename to base/test/android/javatests/src/org/chromium/base/test/params/BlockJUnit4RunnerDelegate.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/MethodParamAnnotationRule.java b/base/test/android/javatests/src/org/chromium/base/test/params/MethodParamAnnotationRule.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/MethodParamAnnotationRule.java rename to base/test/android/javatests/src/org/chromium/base/test/params/MethodParamAnnotationRule.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/MethodParamRule.java b/base/test/android/javatests/src/org/chromium/base/test/params/MethodParamRule.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/MethodParamRule.java rename to base/test/android/javatests/src/org/chromium/base/test/params/MethodParamRule.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterAnnotations.java b/base/test/android/javatests/src/org/chromium/base/test/params/ParameterAnnotations.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterAnnotations.java rename to base/test/android/javatests/src/org/chromium/base/test/params/ParameterAnnotations.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterProvider.java b/base/test/android/javatests/src/org/chromium/base/test/params/ParameterProvider.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterProvider.java rename to base/test/android/javatests/src/org/chromium/base/test/params/ParameterProvider.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterSet.java b/base/test/android/javatests/src/org/chromium/base/test/params/ParameterSet.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterSet.java rename to base/test/android/javatests/src/org/chromium/base/test/params/ParameterSet.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedFrameworkMethod.java b/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedFrameworkMethod.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedFrameworkMethod.java rename to base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedFrameworkMethod.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunner.java b/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunner.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunner.java rename to base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunner.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegate.java b/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegate.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegate.java rename to base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegate.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommon.java b/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommon.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommon.java rename to base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommon.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactory.java b/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactory.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactory.java rename to base/test/android/javatests/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactory.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java b/base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java rename to base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/AnnotationProcessingUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/AnnotationProcessingUtils.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/AnnotationProcessingUtils.java rename to base/test/android/javatests/src/org/chromium/base/test/util/AnnotationProcessingUtils.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/AnnotationRule.java b/base/test/android/javatests/src/org/chromium/base/test/util/AnnotationRule.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/AnnotationRule.java rename to base/test/android/javatests/src/org/chromium/base/test/util/AnnotationRule.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/CallbackHelper.java b/base/test/android/javatests/src/org/chromium/base/test/util/CallbackHelper.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/CallbackHelper.java rename to base/test/android/javatests/src/org/chromium/base/test/util/CallbackHelper.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/CommandLineFlags.java b/base/test/android/javatests/src/org/chromium/base/test/util/CommandLineFlags.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/CommandLineFlags.java rename to base/test/android/javatests/src/org/chromium/base/test/util/CommandLineFlags.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/DisableIf.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIf.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/DisableIf.java rename to base/test/android/javatests/src/org/chromium/base/test/util/DisableIf.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java rename to base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java rename to base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java rename to base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/Feature.java b/base/test/android/javatests/src/org/chromium/base/test/util/Feature.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/Feature.java rename to base/test/android/javatests/src/org/chromium/base/test/util/Feature.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/FlakyTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/FlakyTest.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/FlakyTest.java rename to base/test/android/javatests/src/org/chromium/base/test/util/FlakyTest.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java b/base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java rename to base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java rename to base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/IntegrationTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/IntegrationTest.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/IntegrationTest.java rename to base/test/android/javatests/src/org/chromium/base/test/util/IntegrationTest.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/Manual.java b/base/test/android/javatests/src/org/chromium/base/test/util/Manual.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/Manual.java rename to base/test/android/javatests/src/org/chromium/base/test/util/Manual.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/Matchers.java b/base/test/android/javatests/src/org/chromium/base/test/util/Matchers.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/Matchers.java rename to base/test/android/javatests/src/org/chromium/base/test/util/Matchers.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/MetricsUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/MetricsUtils.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/MetricsUtils.java rename to base/test/android/javatests/src/org/chromium/base/test/util/MetricsUtils.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java b/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java rename to base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java rename to base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java b/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java rename to base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/RestrictionSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/RestrictionSkipCheck.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/RestrictionSkipCheck.java rename to base/test/android/javatests/src/org/chromium/base/test/util/RestrictionSkipCheck.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/RetryOnFailure.java b/base/test/android/javatests/src/org/chromium/base/test/util/RetryOnFailure.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/RetryOnFailure.java rename to base/test/android/javatests/src/org/chromium/base/test/util/RetryOnFailure.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java b/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java rename to base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/SkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/SkipCheck.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/SkipCheck.java rename to base/test/android/javatests/src/org/chromium/base/test/util/SkipCheck.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java b/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java rename to base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java b/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java rename to base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java rename to base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/UserActionTester.java b/base/test/android/javatests/src/org/chromium/base/test/util/UserActionTester.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/UserActionTester.java rename to base/test/android/javatests/src/org/chromium/base/test/util/UserActionTester.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/parameter/CommandLineParameter.java b/base/test/android/javatests/src/org/chromium/base/test/util/parameter/CommandLineParameter.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/parameter/CommandLineParameter.java rename to base/test/android/javatests/src/org/chromium/base/test/util/parameter/CommandLineParameter.java
diff --git a/src/base/test/android/javatests/src/org/chromium/base/test/util/parameter/SkipCommandLineParameterization.java b/base/test/android/javatests/src/org/chromium/base/test/util/parameter/SkipCommandLineParameterization.java similarity index 100% rename from src/base/test/android/javatests/src/org/chromium/base/test/util/parameter/SkipCommandLineParameterization.java rename to base/test/android/javatests/src/org/chromium/base/test/util/parameter/SkipCommandLineParameterization.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/task/test/BackgroundShadowAsyncTask.java b/base/test/android/junit/src/org/chromium/base/task/test/BackgroundShadowAsyncTask.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/task/test/BackgroundShadowAsyncTask.java rename to base/test/android/junit/src/org/chromium/base/task/test/BackgroundShadowAsyncTask.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/task/test/CustomShadowAsyncTask.java b/base/test/android/junit/src/org/chromium/base/task/test/CustomShadowAsyncTask.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/task/test/CustomShadowAsyncTask.java rename to base/test/android/junit/src/org/chromium/base/task/test/CustomShadowAsyncTask.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java b/base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java rename to base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java b/base/test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java rename to base/test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/TestListInstrumentationRunListenerTest.java b/base/test/android/junit/src/org/chromium/base/test/TestListInstrumentationRunListenerTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/TestListInstrumentationRunListenerTest.java rename to base/test/android/junit/src/org/chromium/base/test/TestListInstrumentationRunListenerTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/params/ExampleParameterizedTest.java b/base/test/android/junit/src/org/chromium/base/test/params/ExampleParameterizedTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/params/ExampleParameterizedTest.java rename to base/test/android/junit/src/org/chromium/base/test/params/ExampleParameterizedTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommonTest.java b/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommonTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommonTest.java rename to base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateCommonTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactoryTest.java b/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactoryTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactoryTest.java rename to base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerDelegateFactoryTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerTest.java b/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerTest.java rename to base/test/android/junit/src/org/chromium/base/test/params/ParameterizedRunnerTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedTestNameTest.java b/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedTestNameTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/params/ParameterizedTestNameTest.java rename to base/test/android/junit/src/org/chromium/base/test/params/ParameterizedTestNameTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/util/AnnotationProcessingUtilsTest.java b/base/test/android/junit/src/org/chromium/base/test/util/AnnotationProcessingUtilsTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/util/AnnotationProcessingUtilsTest.java rename to base/test/android/junit/src/org/chromium/base/test/util/AnnotationProcessingUtilsTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java b/base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java rename to base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java b/base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java rename to base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java b/base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java rename to base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/util/SkipCheckTest.java b/base/test/android/junit/src/org/chromium/base/test/util/SkipCheckTest.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/util/SkipCheckTest.java rename to base/test/android/junit/src/org/chromium/base/test/util/SkipCheckTest.java
diff --git a/src/base/test/android/junit/src/org/chromium/base/test/util/TestRunnerTestRule.java b/base/test/android/junit/src/org/chromium/base/test/util/TestRunnerTestRule.java similarity index 100% rename from src/base/test/android/junit/src/org/chromium/base/test/util/TestRunnerTestRule.java rename to base/test/android/junit/src/org/chromium/base/test/util/TestRunnerTestRule.java
diff --git a/src/base/test/android/url_utils.cc b/base/test/android/url_utils.cc similarity index 100% rename from src/base/test/android/url_utils.cc rename to base/test/android/url_utils.cc
diff --git a/src/base/test/android/url_utils.h b/base/test/android/url_utils.h similarity index 100% rename from src/base/test/android/url_utils.h rename to base/test/android/url_utils.h
diff --git a/src/base/test/bind_test_util.h b/base/test/bind_test_util.h similarity index 100% rename from src/base/test/bind_test_util.h rename to base/test/bind_test_util.h
diff --git a/src/base/test/clang_coverage.cc b/base/test/clang_coverage.cc similarity index 100% rename from src/base/test/clang_coverage.cc rename to base/test/clang_coverage.cc
diff --git a/src/base/test/clang_coverage.h b/base/test/clang_coverage.h similarity index 100% rename from src/base/test/clang_coverage.h rename to base/test/clang_coverage.h
diff --git a/src/base/test/copy_only_int.h b/base/test/copy_only_int.h similarity index 100% rename from src/base/test/copy_only_int.h rename to base/test/copy_only_int.h
diff --git a/src/base/test/data/file_util/binary_file.bin b/base/test/data/file_util/binary_file.bin similarity index 100% rename from src/base/test/data/file_util/binary_file.bin rename to base/test/data/file_util/binary_file.bin Binary files differ
diff --git a/src/base/test/data/file_util/binary_file_diff.bin b/base/test/data/file_util/binary_file_diff.bin similarity index 100% rename from src/base/test/data/file_util/binary_file_diff.bin rename to base/test/data/file_util/binary_file_diff.bin Binary files differ
diff --git a/src/base/test/data/file_util/binary_file_same.bin b/base/test/data/file_util/binary_file_same.bin similarity index 100% rename from src/base/test/data/file_util/binary_file_same.bin rename to base/test/data/file_util/binary_file_same.bin Binary files differ
diff --git a/src/base/test/data/file_util/blank_line.txt b/base/test/data/file_util/blank_line.txt similarity index 100% rename from src/base/test/data/file_util/blank_line.txt rename to base/test/data/file_util/blank_line.txt
diff --git a/src/base/test/data/file_util/blank_line_crlf.txt b/base/test/data/file_util/blank_line_crlf.txt similarity index 100% rename from src/base/test/data/file_util/blank_line_crlf.txt rename to base/test/data/file_util/blank_line_crlf.txt
diff --git a/src/base/test/data/file_util/crlf.txt b/base/test/data/file_util/crlf.txt similarity index 100% rename from src/base/test/data/file_util/crlf.txt rename to base/test/data/file_util/crlf.txt
diff --git a/src/base/test/data/file_util/different.txt b/base/test/data/file_util/different.txt similarity index 100% rename from src/base/test/data/file_util/different.txt rename to base/test/data/file_util/different.txt
diff --git a/src/base/test/data/file_util/different_first.txt b/base/test/data/file_util/different_first.txt similarity index 100% rename from src/base/test/data/file_util/different_first.txt rename to base/test/data/file_util/different_first.txt
diff --git a/src/base/test/data/file_util/different_last.txt b/base/test/data/file_util/different_last.txt similarity index 100% rename from src/base/test/data/file_util/different_last.txt rename to base/test/data/file_util/different_last.txt
diff --git a/src/base/test/data/file_util/empty1.txt b/base/test/data/file_util/empty1.txt similarity index 100% rename from src/base/test/data/file_util/empty1.txt rename to base/test/data/file_util/empty1.txt
diff --git a/src/base/test/data/file_util/empty2.txt b/base/test/data/file_util/empty2.txt similarity index 100% rename from src/base/test/data/file_util/empty2.txt rename to base/test/data/file_util/empty2.txt
diff --git a/src/base/test/data/file_util/first1.txt b/base/test/data/file_util/first1.txt similarity index 100% rename from src/base/test/data/file_util/first1.txt rename to base/test/data/file_util/first1.txt
diff --git a/src/base/test/data/file_util/first2.txt b/base/test/data/file_util/first2.txt similarity index 100% rename from src/base/test/data/file_util/first2.txt rename to base/test/data/file_util/first2.txt
diff --git a/src/base/test/data/file_util/original.txt b/base/test/data/file_util/original.txt similarity index 100% rename from src/base/test/data/file_util/original.txt rename to base/test/data/file_util/original.txt
diff --git a/src/base/test/data/file_util/red.png b/base/test/data/file_util/red.png similarity index 100% rename from src/base/test/data/file_util/red.png rename to base/test/data/file_util/red.png Binary files differ
diff --git a/src/base/test/data/file_util/same.txt b/base/test/data/file_util/same.txt similarity index 100% rename from src/base/test/data/file_util/same.txt rename to base/test/data/file_util/same.txt
diff --git a/src/base/test/data/file_util/same_length.txt b/base/test/data/file_util/same_length.txt similarity index 100% rename from src/base/test/data/file_util/same_length.txt rename to base/test/data/file_util/same_length.txt
diff --git a/src/base/test/data/file_util/shortened.txt b/base/test/data/file_util/shortened.txt similarity index 100% rename from src/base/test/data/file_util/shortened.txt rename to base/test/data/file_util/shortened.txt
diff --git a/src/base/test/data/file_version_info_unittest/FileVersionInfoTest1.dll b/base/test/data/file_version_info_unittest/FileVersionInfoTest1.dll similarity index 100% rename from src/base/test/data/file_version_info_unittest/FileVersionInfoTest1.dll rename to base/test/data/file_version_info_unittest/FileVersionInfoTest1.dll Binary files differ
diff --git a/src/base/test/data/file_version_info_unittest/FileVersionInfoTest2.dll b/base/test/data/file_version_info_unittest/FileVersionInfoTest2.dll similarity index 100% rename from src/base/test/data/file_version_info_unittest/FileVersionInfoTest2.dll rename to base/test/data/file_version_info_unittest/FileVersionInfoTest2.dll Binary files differ
diff --git a/src/base/test/data/json/bom_feff.json b/base/test/data/json/bom_feff.json similarity index 100% rename from src/base/test/data/json/bom_feff.json rename to base/test/data/json/bom_feff.json
diff --git a/src/base/test/data/pe_image/pe_image_test_32.dll b/base/test/data/pe_image/pe_image_test_32.dll similarity index 100% rename from src/base/test/data/pe_image/pe_image_test_32.dll rename to base/test/data/pe_image/pe_image_test_32.dll Binary files differ
diff --git a/src/base/test/data/pe_image/pe_image_test_64.dll b/base/test/data/pe_image/pe_image_test_64.dll similarity index 100% rename from src/base/test/data/pe_image/pe_image_test_64.dll rename to base/test/data/pe_image/pe_image_test_64.dll Binary files differ
diff --git a/src/base/test/data/serializer_nested_test.json b/base/test/data/serializer_nested_test.json similarity index 100% rename from src/base/test/data/serializer_nested_test.json rename to base/test/data/serializer_nested_test.json
diff --git a/src/base/test/data/serializer_test.json b/base/test/data/serializer_test.json similarity index 100% rename from src/base/test/data/serializer_test.json rename to base/test/data/serializer_test.json
diff --git a/src/base/test/data/serializer_test_nowhitespace.json b/base/test/data/serializer_test_nowhitespace.json similarity index 100% rename from src/base/test/data/serializer_test_nowhitespace.json rename to base/test/data/serializer_test_nowhitespace.json
diff --git a/src/base/test/fontconfig_util_linux.cc b/base/test/fontconfig_util_linux.cc similarity index 100% rename from src/base/test/fontconfig_util_linux.cc rename to base/test/fontconfig_util_linux.cc
diff --git a/src/base/test/fontconfig_util_linux.h b/base/test/fontconfig_util_linux.h similarity index 100% rename from src/base/test/fontconfig_util_linux.h rename to base/test/fontconfig_util_linux.h
diff --git a/src/base/test/fuzzed_data_provider.cc b/base/test/fuzzed_data_provider.cc similarity index 100% rename from src/base/test/fuzzed_data_provider.cc rename to base/test/fuzzed_data_provider.cc
diff --git a/src/base/test/fuzzed_data_provider.h b/base/test/fuzzed_data_provider.h similarity index 100% rename from src/base/test/fuzzed_data_provider.h rename to base/test/fuzzed_data_provider.h
diff --git a/src/base/test/generate_fontconfig_caches.cc b/base/test/generate_fontconfig_caches.cc similarity index 100% rename from src/base/test/generate_fontconfig_caches.cc rename to base/test/generate_fontconfig_caches.cc
diff --git a/src/base/test/gtest_util.cc b/base/test/gtest_util.cc similarity index 100% rename from src/base/test/gtest_util.cc rename to base/test/gtest_util.cc
diff --git a/src/base/test/gtest_util.h b/base/test/gtest_util.h similarity index 100% rename from src/base/test/gtest_util.h rename to base/test/gtest_util.h
diff --git a/src/base/test/gtest_xml_unittest_result_printer.cc b/base/test/gtest_xml_unittest_result_printer.cc similarity index 100% rename from src/base/test/gtest_xml_unittest_result_printer.cc rename to base/test/gtest_xml_unittest_result_printer.cc
diff --git a/src/base/test/gtest_xml_unittest_result_printer.h b/base/test/gtest_xml_unittest_result_printer.h similarity index 100% rename from src/base/test/gtest_xml_unittest_result_printer.h rename to base/test/gtest_xml_unittest_result_printer.h
diff --git a/src/base/test/gtest_xml_util.cc b/base/test/gtest_xml_util.cc similarity index 100% rename from src/base/test/gtest_xml_util.cc rename to base/test/gtest_xml_util.cc
diff --git a/src/base/test/gtest_xml_util.h b/base/test/gtest_xml_util.h similarity index 100% rename from src/base/test/gtest_xml_util.h rename to base/test/gtest_xml_util.h
diff --git a/src/base/test/icu_test_util.cc b/base/test/icu_test_util.cc similarity index 100% rename from src/base/test/icu_test_util.cc rename to base/test/icu_test_util.cc
diff --git a/src/base/test/icu_test_util.h b/base/test/icu_test_util.h similarity index 100% rename from src/base/test/icu_test_util.h rename to base/test/icu_test_util.h
diff --git a/src/base/test/ios/wait_util.h b/base/test/ios/wait_util.h similarity index 100% rename from src/base/test/ios/wait_util.h rename to base/test/ios/wait_util.h
diff --git a/src/base/test/ios/wait_util.mm b/base/test/ios/wait_util.mm similarity index 100% rename from src/base/test/ios/wait_util.mm rename to base/test/ios/wait_util.mm
diff --git a/src/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc similarity index 100% rename from src/base/test/launcher/test_launcher.cc rename to base/test/launcher/test_launcher.cc
diff --git a/src/base/test/launcher/test_launcher.h b/base/test/launcher/test_launcher.h similarity index 100% rename from src/base/test/launcher/test_launcher.h rename to base/test/launcher/test_launcher.h
diff --git a/src/base/test/launcher/test_launcher_nacl_nonsfi.cc b/base/test/launcher/test_launcher_nacl_nonsfi.cc similarity index 100% rename from src/base/test/launcher/test_launcher_nacl_nonsfi.cc rename to base/test/launcher/test_launcher_nacl_nonsfi.cc
diff --git a/src/base/test/launcher/test_launcher_nacl_nonsfi.h b/base/test/launcher/test_launcher_nacl_nonsfi.h similarity index 100% rename from src/base/test/launcher/test_launcher_nacl_nonsfi.h rename to base/test/launcher/test_launcher_nacl_nonsfi.h
diff --git a/src/base/test/launcher/test_launcher_tracer.cc b/base/test/launcher/test_launcher_tracer.cc similarity index 100% rename from src/base/test/launcher/test_launcher_tracer.cc rename to base/test/launcher/test_launcher_tracer.cc
diff --git a/src/base/test/launcher/test_launcher_tracer.h b/base/test/launcher/test_launcher_tracer.h similarity index 100% rename from src/base/test/launcher/test_launcher_tracer.h rename to base/test/launcher/test_launcher_tracer.h
diff --git a/src/base/test/launcher/test_result.cc b/base/test/launcher/test_result.cc similarity index 100% rename from src/base/test/launcher/test_result.cc rename to base/test/launcher/test_result.cc
diff --git a/src/base/test/launcher/test_result.h b/base/test/launcher/test_result.h similarity index 100% rename from src/base/test/launcher/test_result.h rename to base/test/launcher/test_result.h
diff --git a/src/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc similarity index 100% rename from src/base/test/launcher/test_results_tracker.cc rename to base/test/launcher/test_results_tracker.cc
diff --git a/src/base/test/launcher/test_results_tracker.h b/base/test/launcher/test_results_tracker.h similarity index 100% rename from src/base/test/launcher/test_results_tracker.h rename to base/test/launcher/test_results_tracker.h
diff --git a/src/base/test/launcher/unit_test_launcher.cc b/base/test/launcher/unit_test_launcher.cc similarity index 100% rename from src/base/test/launcher/unit_test_launcher.cc rename to base/test/launcher/unit_test_launcher.cc
diff --git a/src/base/test/launcher/unit_test_launcher.h b/base/test/launcher/unit_test_launcher.h similarity index 100% rename from src/base/test/launcher/unit_test_launcher.h rename to base/test/launcher/unit_test_launcher.h
diff --git a/src/base/test/launcher/unit_test_launcher_ios.cc b/base/test/launcher/unit_test_launcher_ios.cc similarity index 100% rename from src/base/test/launcher/unit_test_launcher_ios.cc rename to base/test/launcher/unit_test_launcher_ios.cc
diff --git a/src/base/test/launcher/unit_test_launcher_nacl_nonsfi.cc b/base/test/launcher/unit_test_launcher_nacl_nonsfi.cc similarity index 100% rename from src/base/test/launcher/unit_test_launcher_nacl_nonsfi.cc rename to base/test/launcher/unit_test_launcher_nacl_nonsfi.cc
diff --git a/src/base/test/main_hook.cc b/base/test/main_hook.cc similarity index 100% rename from src/base/test/main_hook.cc rename to base/test/main_hook.cc
diff --git a/src/base/test/main_hook.h b/base/test/main_hook.h similarity index 100% rename from src/base/test/main_hook.h rename to base/test/main_hook.h
diff --git a/src/base/test/malloc_wrapper.cc b/base/test/malloc_wrapper.cc similarity index 100% rename from src/base/test/malloc_wrapper.cc rename to base/test/malloc_wrapper.cc
diff --git a/src/base/test/malloc_wrapper.h b/base/test/malloc_wrapper.h similarity index 100% rename from src/base/test/malloc_wrapper.h rename to base/test/malloc_wrapper.h
diff --git a/src/base/test/metrics/histogram_enum_reader.cc b/base/test/metrics/histogram_enum_reader.cc similarity index 100% rename from src/base/test/metrics/histogram_enum_reader.cc rename to base/test/metrics/histogram_enum_reader.cc
diff --git a/src/base/test/metrics/histogram_enum_reader.h b/base/test/metrics/histogram_enum_reader.h similarity index 100% rename from src/base/test/metrics/histogram_enum_reader.h rename to base/test/metrics/histogram_enum_reader.h
diff --git a/src/base/test/metrics/histogram_enum_reader_unittest.cc b/base/test/metrics/histogram_enum_reader_unittest.cc similarity index 100% rename from src/base/test/metrics/histogram_enum_reader_unittest.cc rename to base/test/metrics/histogram_enum_reader_unittest.cc
diff --git a/src/base/test/metrics/histogram_tester.cc b/base/test/metrics/histogram_tester.cc similarity index 100% rename from src/base/test/metrics/histogram_tester.cc rename to base/test/metrics/histogram_tester.cc
diff --git a/src/base/test/metrics/histogram_tester.h b/base/test/metrics/histogram_tester.h similarity index 100% rename from src/base/test/metrics/histogram_tester.h rename to base/test/metrics/histogram_tester.h
diff --git a/src/base/test/metrics/histogram_tester_unittest.cc b/base/test/metrics/histogram_tester_unittest.cc similarity index 100% rename from src/base/test/metrics/histogram_tester_unittest.cc rename to base/test/metrics/histogram_tester_unittest.cc
diff --git a/src/base/test/metrics/user_action_tester.cc b/base/test/metrics/user_action_tester.cc similarity index 100% rename from src/base/test/metrics/user_action_tester.cc rename to base/test/metrics/user_action_tester.cc
diff --git a/src/base/test/metrics/user_action_tester.h b/base/test/metrics/user_action_tester.h similarity index 100% rename from src/base/test/metrics/user_action_tester.h rename to base/test/metrics/user_action_tester.h
diff --git a/src/base/test/metrics/user_action_tester_unittest.cc b/base/test/metrics/user_action_tester_unittest.cc similarity index 100% rename from src/base/test/metrics/user_action_tester_unittest.cc rename to base/test/metrics/user_action_tester_unittest.cc
diff --git a/src/base/test/mock_callback.h b/base/test/mock_callback.h similarity index 100% rename from src/base/test/mock_callback.h rename to base/test/mock_callback.h
diff --git a/src/base/test/mock_callback.h.pump b/base/test/mock_callback.h.pump similarity index 100% rename from src/base/test/mock_callback.h.pump rename to base/test/mock_callback.h.pump
diff --git a/src/base/test/mock_callback_unittest.cc b/base/test/mock_callback_unittest.cc similarity index 100% rename from src/base/test/mock_callback_unittest.cc rename to base/test/mock_callback_unittest.cc
diff --git a/src/base/test/mock_chrome_application_mac.h b/base/test/mock_chrome_application_mac.h similarity index 100% rename from src/base/test/mock_chrome_application_mac.h rename to base/test/mock_chrome_application_mac.h
diff --git a/src/base/test/mock_chrome_application_mac.mm b/base/test/mock_chrome_application_mac.mm similarity index 100% rename from src/base/test/mock_chrome_application_mac.mm rename to base/test/mock_chrome_application_mac.mm
diff --git a/src/base/test/mock_devices_changed_observer.cc b/base/test/mock_devices_changed_observer.cc similarity index 100% rename from src/base/test/mock_devices_changed_observer.cc rename to base/test/mock_devices_changed_observer.cc
diff --git a/src/base/test/mock_devices_changed_observer.h b/base/test/mock_devices_changed_observer.h similarity index 100% rename from src/base/test/mock_devices_changed_observer.h rename to base/test/mock_devices_changed_observer.h
diff --git a/src/base/test/mock_entropy_provider.cc b/base/test/mock_entropy_provider.cc similarity index 100% rename from src/base/test/mock_entropy_provider.cc rename to base/test/mock_entropy_provider.cc
diff --git a/src/base/test/mock_entropy_provider.h b/base/test/mock_entropy_provider.h similarity index 100% rename from src/base/test/mock_entropy_provider.h rename to base/test/mock_entropy_provider.h
diff --git a/src/base/test/mock_log.cc b/base/test/mock_log.cc similarity index 100% rename from src/base/test/mock_log.cc rename to base/test/mock_log.cc
diff --git a/src/base/test/mock_log.h b/base/test/mock_log.h similarity index 100% rename from src/base/test/mock_log.h rename to base/test/mock_log.h
diff --git a/src/base/test/move_only_int.h b/base/test/move_only_int.h similarity index 100% rename from src/base/test/move_only_int.h rename to base/test/move_only_int.h
diff --git a/src/base/test/multiprocess_test.cc b/base/test/multiprocess_test.cc similarity index 100% rename from src/base/test/multiprocess_test.cc rename to base/test/multiprocess_test.cc
diff --git a/src/base/test/multiprocess_test.h b/base/test/multiprocess_test.h similarity index 100% rename from src/base/test/multiprocess_test.h rename to base/test/multiprocess_test.h
diff --git a/src/base/test/multiprocess_test_android.cc b/base/test/multiprocess_test_android.cc similarity index 100% rename from src/base/test/multiprocess_test_android.cc rename to base/test/multiprocess_test_android.cc
diff --git a/src/base/test/native_library_test_utils.cc b/base/test/native_library_test_utils.cc similarity index 100% rename from src/base/test/native_library_test_utils.cc rename to base/test/native_library_test_utils.cc
diff --git a/src/base/test/native_library_test_utils.h b/base/test/native_library_test_utils.h similarity index 100% rename from src/base/test/native_library_test_utils.h rename to base/test/native_library_test_utils.h
diff --git a/src/base/test/null_task_runner.cc b/base/test/null_task_runner.cc similarity index 100% rename from src/base/test/null_task_runner.cc rename to base/test/null_task_runner.cc
diff --git a/src/base/test/null_task_runner.h b/base/test/null_task_runner.h similarity index 100% rename from src/base/test/null_task_runner.h rename to base/test/null_task_runner.h
diff --git a/src/base/test/perf_log.cc b/base/test/perf_log.cc similarity index 100% rename from src/base/test/perf_log.cc rename to base/test/perf_log.cc
diff --git a/src/base/test/perf_log.h b/base/test/perf_log.h similarity index 100% rename from src/base/test/perf_log.h rename to base/test/perf_log.h
diff --git a/src/base/test/perf_test_suite.cc b/base/test/perf_test_suite.cc similarity index 100% rename from src/base/test/perf_test_suite.cc rename to base/test/perf_test_suite.cc
diff --git a/src/base/test/perf_test_suite.h b/base/test/perf_test_suite.h similarity index 100% rename from src/base/test/perf_test_suite.h rename to base/test/perf_test_suite.h
diff --git a/src/base/test/perf_time_logger.cc b/base/test/perf_time_logger.cc similarity index 100% rename from src/base/test/perf_time_logger.cc rename to base/test/perf_time_logger.cc
diff --git a/src/base/test/perf_time_logger.h b/base/test/perf_time_logger.h similarity index 100% rename from src/base/test/perf_time_logger.h rename to base/test/perf_time_logger.h
diff --git a/src/base/test/power_monitor_test_base.cc b/base/test/power_monitor_test_base.cc similarity index 100% rename from src/base/test/power_monitor_test_base.cc rename to base/test/power_monitor_test_base.cc
diff --git a/src/base/test/power_monitor_test_base.h b/base/test/power_monitor_test_base.h similarity index 100% rename from src/base/test/power_monitor_test_base.h rename to base/test/power_monitor_test_base.h
diff --git a/src/base/test/run_all_base_unittests.cc b/base/test/run_all_base_unittests.cc similarity index 100% rename from src/base/test/run_all_base_unittests.cc rename to base/test/run_all_base_unittests.cc
diff --git a/src/base/test/run_all_perftests.cc b/base/test/run_all_perftests.cc similarity index 100% rename from src/base/test/run_all_perftests.cc rename to base/test/run_all_perftests.cc
diff --git a/src/base/test/run_all_unittests.cc b/base/test/run_all_unittests.cc similarity index 100% rename from src/base/test/run_all_unittests.cc rename to base/test/run_all_unittests.cc
diff --git a/src/base/test/scoped_command_line.cc b/base/test/scoped_command_line.cc similarity index 100% rename from src/base/test/scoped_command_line.cc rename to base/test/scoped_command_line.cc
diff --git a/src/base/test/scoped_command_line.h b/base/test/scoped_command_line.h similarity index 100% rename from src/base/test/scoped_command_line.h rename to base/test/scoped_command_line.h
diff --git a/src/base/test/scoped_environment_variable_override.cc b/base/test/scoped_environment_variable_override.cc similarity index 100% rename from src/base/test/scoped_environment_variable_override.cc rename to base/test/scoped_environment_variable_override.cc
diff --git a/src/base/test/scoped_environment_variable_override.h b/base/test/scoped_environment_variable_override.h similarity index 100% rename from src/base/test/scoped_environment_variable_override.h rename to base/test/scoped_environment_variable_override.h
diff --git a/src/base/test/scoped_feature_list.cc b/base/test/scoped_feature_list.cc similarity index 100% rename from src/base/test/scoped_feature_list.cc rename to base/test/scoped_feature_list.cc
diff --git a/src/base/test/scoped_feature_list.h b/base/test/scoped_feature_list.h similarity index 100% rename from src/base/test/scoped_feature_list.h rename to base/test/scoped_feature_list.h
diff --git a/src/base/test/scoped_feature_list_unittest.cc b/base/test/scoped_feature_list_unittest.cc similarity index 100% rename from src/base/test/scoped_feature_list_unittest.cc rename to base/test/scoped_feature_list_unittest.cc
diff --git a/src/base/test/scoped_locale.cc b/base/test/scoped_locale.cc similarity index 100% rename from src/base/test/scoped_locale.cc rename to base/test/scoped_locale.cc
diff --git a/src/base/test/scoped_locale.h b/base/test/scoped_locale.h similarity index 100% rename from src/base/test/scoped_locale.h rename to base/test/scoped_locale.h
diff --git a/src/base/test/scoped_mock_clock_override.cc b/base/test/scoped_mock_clock_override.cc similarity index 100% rename from src/base/test/scoped_mock_clock_override.cc rename to base/test/scoped_mock_clock_override.cc
diff --git a/src/base/test/scoped_mock_clock_override.h b/base/test/scoped_mock_clock_override.h similarity index 100% rename from src/base/test/scoped_mock_clock_override.h rename to base/test/scoped_mock_clock_override.h
diff --git a/src/base/test/scoped_mock_clock_override_unittest.cc b/base/test/scoped_mock_clock_override_unittest.cc similarity index 100% rename from src/base/test/scoped_mock_clock_override_unittest.cc rename to base/test/scoped_mock_clock_override_unittest.cc
diff --git a/src/base/test/scoped_mock_time_message_loop_task_runner.cc b/base/test/scoped_mock_time_message_loop_task_runner.cc similarity index 100% rename from src/base/test/scoped_mock_time_message_loop_task_runner.cc rename to base/test/scoped_mock_time_message_loop_task_runner.cc
diff --git a/src/base/test/scoped_mock_time_message_loop_task_runner.h b/base/test/scoped_mock_time_message_loop_task_runner.h similarity index 100% rename from src/base/test/scoped_mock_time_message_loop_task_runner.h rename to base/test/scoped_mock_time_message_loop_task_runner.h
diff --git a/src/base/test/scoped_mock_time_message_loop_task_runner_unittest.cc b/base/test/scoped_mock_time_message_loop_task_runner_unittest.cc similarity index 100% rename from src/base/test/scoped_mock_time_message_loop_task_runner_unittest.cc rename to base/test/scoped_mock_time_message_loop_task_runner_unittest.cc
diff --git a/src/base/test/scoped_os_info_override_win.cc b/base/test/scoped_os_info_override_win.cc similarity index 100% rename from src/base/test/scoped_os_info_override_win.cc rename to base/test/scoped_os_info_override_win.cc
diff --git a/src/base/test/scoped_os_info_override_win.h b/base/test/scoped_os_info_override_win.h similarity index 100% rename from src/base/test/scoped_os_info_override_win.h rename to base/test/scoped_os_info_override_win.h
diff --git a/src/base/test/scoped_path_override.cc b/base/test/scoped_path_override.cc similarity index 100% rename from src/base/test/scoped_path_override.cc rename to base/test/scoped_path_override.cc
diff --git a/src/base/test/scoped_path_override.h b/base/test/scoped_path_override.h similarity index 100% rename from src/base/test/scoped_path_override.h rename to base/test/scoped_path_override.h
diff --git a/src/base/test/scoped_task_environment.cc b/base/test/scoped_task_environment.cc similarity index 100% rename from src/base/test/scoped_task_environment.cc rename to base/test/scoped_task_environment.cc
diff --git a/src/base/test/scoped_task_environment.h b/base/test/scoped_task_environment.h similarity index 100% rename from src/base/test/scoped_task_environment.h rename to base/test/scoped_task_environment.h
diff --git a/src/base/test/scoped_task_environment_unittest.cc b/base/test/scoped_task_environment_unittest.cc similarity index 100% rename from src/base/test/scoped_task_environment_unittest.cc rename to base/test/scoped_task_environment_unittest.cc
diff --git a/src/base/test/sequenced_task_runner_test_template.cc b/base/test/sequenced_task_runner_test_template.cc similarity index 100% rename from src/base/test/sequenced_task_runner_test_template.cc rename to base/test/sequenced_task_runner_test_template.cc
diff --git a/src/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h similarity index 100% rename from src/base/test/sequenced_task_runner_test_template.h rename to base/test/sequenced_task_runner_test_template.h
diff --git a/src/base/test/simple_test_clock.cc b/base/test/simple_test_clock.cc similarity index 100% rename from src/base/test/simple_test_clock.cc rename to base/test/simple_test_clock.cc
diff --git a/src/base/test/simple_test_clock.h b/base/test/simple_test_clock.h similarity index 100% rename from src/base/test/simple_test_clock.h rename to base/test/simple_test_clock.h
diff --git a/src/base/test/simple_test_tick_clock.cc b/base/test/simple_test_tick_clock.cc similarity index 100% rename from src/base/test/simple_test_tick_clock.cc rename to base/test/simple_test_tick_clock.cc
diff --git a/src/base/test/simple_test_tick_clock.h b/base/test/simple_test_tick_clock.h similarity index 100% rename from src/base/test/simple_test_tick_clock.h rename to base/test/simple_test_tick_clock.h
diff --git a/src/base/test/task_runner_test_template.cc b/base/test/task_runner_test_template.cc similarity index 100% rename from src/base/test/task_runner_test_template.cc rename to base/test/task_runner_test_template.cc
diff --git a/src/base/test/task_runner_test_template.h b/base/test/task_runner_test_template.h similarity index 100% rename from src/base/test/task_runner_test_template.h rename to base/test/task_runner_test_template.h
diff --git a/src/base/test/test.gypi b/base/test/test.gypi similarity index 100% rename from src/base/test/test.gypi rename to base/test/test.gypi
diff --git a/src/base/test/test_child_process.cc b/base/test/test_child_process.cc similarity index 100% rename from src/base/test/test_child_process.cc rename to base/test/test_child_process.cc
diff --git a/src/base/test/test_discardable_memory_allocator.cc b/base/test/test_discardable_memory_allocator.cc similarity index 100% rename from src/base/test/test_discardable_memory_allocator.cc rename to base/test/test_discardable_memory_allocator.cc
diff --git a/src/base/test/test_discardable_memory_allocator.h b/base/test/test_discardable_memory_allocator.h similarity index 100% rename from src/base/test/test_discardable_memory_allocator.h rename to base/test/test_discardable_memory_allocator.h
diff --git a/src/base/test/test_file_util.cc b/base/test/test_file_util.cc similarity index 100% rename from src/base/test/test_file_util.cc rename to base/test/test_file_util.cc
diff --git a/src/base/test/test_file_util.h b/base/test/test_file_util.h similarity index 100% rename from src/base/test/test_file_util.h rename to base/test/test_file_util.h
diff --git a/src/base/test/test_file_util_android.cc b/base/test/test_file_util_android.cc similarity index 100% rename from src/base/test/test_file_util_android.cc rename to base/test/test_file_util_android.cc
diff --git a/src/base/test/test_file_util_linux.cc b/base/test/test_file_util_linux.cc similarity index 100% rename from src/base/test/test_file_util_linux.cc rename to base/test/test_file_util_linux.cc
diff --git a/src/base/test/test_file_util_mac.cc b/base/test/test_file_util_mac.cc similarity index 100% rename from src/base/test/test_file_util_mac.cc rename to base/test/test_file_util_mac.cc
diff --git a/src/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc similarity index 100% rename from src/base/test/test_file_util_posix.cc rename to base/test/test_file_util_posix.cc
diff --git a/src/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc similarity index 100% rename from src/base/test/test_file_util_win.cc rename to base/test/test_file_util_win.cc
diff --git a/src/base/test/test_io_thread.cc b/base/test/test_io_thread.cc similarity index 100% rename from src/base/test/test_io_thread.cc rename to base/test/test_io_thread.cc
diff --git a/src/base/test/test_io_thread.h b/base/test/test_io_thread.h similarity index 100% rename from src/base/test/test_io_thread.h rename to base/test/test_io_thread.h
diff --git a/src/base/test/test_listener_ios.h b/base/test/test_listener_ios.h similarity index 100% rename from src/base/test/test_listener_ios.h rename to base/test/test_listener_ios.h
diff --git a/src/base/test/test_listener_ios.mm b/base/test/test_listener_ios.mm similarity index 100% rename from src/base/test/test_listener_ios.mm rename to base/test/test_listener_ios.mm
diff --git a/src/base/test/test_message_loop.cc b/base/test/test_message_loop.cc similarity index 100% rename from src/base/test/test_message_loop.cc rename to base/test/test_message_loop.cc
diff --git a/src/base/test/test_message_loop.h b/base/test/test_message_loop.h similarity index 100% rename from src/base/test/test_message_loop.h rename to base/test/test_message_loop.h
diff --git a/src/base/test/test_mock_time_task_runner.cc b/base/test/test_mock_time_task_runner.cc similarity index 100% rename from src/base/test/test_mock_time_task_runner.cc rename to base/test/test_mock_time_task_runner.cc
diff --git a/src/base/test/test_mock_time_task_runner.h b/base/test/test_mock_time_task_runner.h similarity index 100% rename from src/base/test/test_mock_time_task_runner.h rename to base/test/test_mock_time_task_runner.h
diff --git a/src/base/test/test_mock_time_task_runner_unittest.cc b/base/test/test_mock_time_task_runner_unittest.cc similarity index 100% rename from src/base/test/test_mock_time_task_runner_unittest.cc rename to base/test/test_mock_time_task_runner_unittest.cc
diff --git a/src/base/test/test_pending_task.cc b/base/test/test_pending_task.cc similarity index 100% rename from src/base/test/test_pending_task.cc rename to base/test/test_pending_task.cc
diff --git a/src/base/test/test_pending_task.h b/base/test/test_pending_task.h similarity index 100% rename from src/base/test/test_pending_task.h rename to base/test/test_pending_task.h
diff --git a/src/base/test/test_pending_task_unittest.cc b/base/test/test_pending_task_unittest.cc similarity index 100% rename from src/base/test/test_pending_task_unittest.cc rename to base/test/test_pending_task_unittest.cc
diff --git a/src/base/test/test_reg_util_win.cc b/base/test/test_reg_util_win.cc similarity index 100% rename from src/base/test/test_reg_util_win.cc rename to base/test/test_reg_util_win.cc
diff --git a/src/base/test/test_reg_util_win.h b/base/test/test_reg_util_win.h similarity index 100% rename from src/base/test/test_reg_util_win.h rename to base/test/test_reg_util_win.h
diff --git a/src/base/test/test_reg_util_win_unittest.cc b/base/test/test_reg_util_win_unittest.cc similarity index 100% rename from src/base/test/test_reg_util_win_unittest.cc rename to base/test/test_reg_util_win_unittest.cc
diff --git a/src/base/test/test_shared_library.cc b/base/test/test_shared_library.cc similarity index 100% rename from src/base/test/test_shared_library.cc rename to base/test/test_shared_library.cc
diff --git a/src/base/test/test_shared_memory_util.cc b/base/test/test_shared_memory_util.cc similarity index 100% rename from src/base/test/test_shared_memory_util.cc rename to base/test/test_shared_memory_util.cc
diff --git a/src/base/test/test_shared_memory_util.h b/base/test/test_shared_memory_util.h similarity index 100% rename from src/base/test/test_shared_memory_util.h rename to base/test/test_shared_memory_util.h
diff --git a/src/base/test/test_shortcut_win.cc b/base/test/test_shortcut_win.cc similarity index 100% rename from src/base/test/test_shortcut_win.cc rename to base/test/test_shortcut_win.cc
diff --git a/src/base/test/test_shortcut_win.h b/base/test/test_shortcut_win.h similarity index 100% rename from src/base/test/test_shortcut_win.h rename to base/test/test_shortcut_win.h
diff --git a/src/base/test/test_simple_task_runner.cc b/base/test/test_simple_task_runner.cc similarity index 100% rename from src/base/test/test_simple_task_runner.cc rename to base/test/test_simple_task_runner.cc
diff --git a/src/base/test/test_simple_task_runner.h b/base/test/test_simple_task_runner.h similarity index 100% rename from src/base/test/test_simple_task_runner.h rename to base/test/test_simple_task_runner.h
diff --git a/src/base/test/test_suite.cc b/base/test/test_suite.cc similarity index 100% rename from src/base/test/test_suite.cc rename to base/test/test_suite.cc
diff --git a/src/base/test/test_suite.h b/base/test/test_suite.h similarity index 100% rename from src/base/test/test_suite.h rename to base/test/test_suite.h
diff --git a/src/base/test/test_support_android.cc b/base/test/test_support_android.cc similarity index 100% rename from src/base/test/test_support_android.cc rename to base/test/test_support_android.cc
diff --git a/src/base/test/test_support_android.h b/base/test/test_support_android.h similarity index 100% rename from src/base/test/test_support_android.h rename to base/test/test_support_android.h
diff --git a/src/base/test/test_support_ios.h b/base/test/test_support_ios.h similarity index 100% rename from src/base/test/test_support_ios.h rename to base/test/test_support_ios.h
diff --git a/src/base/test/test_support_ios.mm b/base/test/test_support_ios.mm similarity index 100% rename from src/base/test/test_support_ios.mm rename to base/test/test_support_ios.mm
diff --git a/src/base/test/test_switches.cc b/base/test/test_switches.cc similarity index 100% rename from src/base/test/test_switches.cc rename to base/test/test_switches.cc
diff --git a/src/base/test/test_switches.h b/base/test/test_switches.h similarity index 100% rename from src/base/test/test_switches.h rename to base/test/test_switches.h
diff --git a/src/base/test/test_timeouts.cc b/base/test/test_timeouts.cc similarity index 100% rename from src/base/test/test_timeouts.cc rename to base/test/test_timeouts.cc
diff --git a/src/base/test/test_timeouts.h b/base/test/test_timeouts.h similarity index 100% rename from src/base/test/test_timeouts.h rename to base/test/test_timeouts.h
diff --git a/src/base/test/thread_test_helper.cc b/base/test/thread_test_helper.cc similarity index 100% rename from src/base/test/thread_test_helper.cc rename to base/test/thread_test_helper.cc
diff --git a/src/base/test/thread_test_helper.h b/base/test/thread_test_helper.h similarity index 100% rename from src/base/test/thread_test_helper.h rename to base/test/thread_test_helper.h
diff --git a/src/base/test/time_helpers.cc b/base/test/time_helpers.cc similarity index 100% rename from src/base/test/time_helpers.cc rename to base/test/time_helpers.cc
diff --git a/src/base/test/time_helpers.h b/base/test/time_helpers.h similarity index 100% rename from src/base/test/time_helpers.h rename to base/test/time_helpers.h
diff --git a/src/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc similarity index 100% rename from src/base/test/trace_event_analyzer.cc rename to base/test/trace_event_analyzer.cc
diff --git a/src/base/test/trace_event_analyzer.h b/base/test/trace_event_analyzer.h similarity index 100% rename from src/base/test/trace_event_analyzer.h rename to base/test/trace_event_analyzer.h
diff --git a/src/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc similarity index 100% rename from src/base/test/trace_event_analyzer_unittest.cc rename to base/test/trace_event_analyzer_unittest.cc
diff --git a/src/base/test/trace_to_file.cc b/base/test/trace_to_file.cc similarity index 100% rename from src/base/test/trace_to_file.cc rename to base/test/trace_to_file.cc
diff --git a/src/base/test/trace_to_file.h b/base/test/trace_to_file.h similarity index 100% rename from src/base/test/trace_to_file.h rename to base/test/trace_to_file.h
diff --git a/src/base/test/values_test_util.cc b/base/test/values_test_util.cc similarity index 100% rename from src/base/test/values_test_util.cc rename to base/test/values_test_util.cc
diff --git a/src/base/test/values_test_util.h b/base/test/values_test_util.h similarity index 100% rename from src/base/test/values_test_util.h rename to base/test/values_test_util.h
diff --git a/src/base/third_party/dmg_fp/LICENSE b/base/third_party/dmg_fp/LICENSE similarity index 100% rename from src/base/third_party/dmg_fp/LICENSE rename to base/third_party/dmg_fp/LICENSE
diff --git a/src/base/third_party/dmg_fp/README.chromium b/base/third_party/dmg_fp/README.chromium similarity index 100% rename from src/base/third_party/dmg_fp/README.chromium rename to base/third_party/