Skip to content

Commit

Permalink
Remove unnecessary includes of base/memory/ptr_util.h in ui/.
Browse files Browse the repository at this point in the history
It no longer defines base::MakeUnique, so it should only be included
where base::WrapUnique is used.

Generated by:
  for x in `git grep -l '#include "base/memory/ptr_util.h"' ui`; do \
    grep -q WrapUnique "$x" || sed -i -e \
    '/^#include "base\/memory\/ptr_util\.h"$/d' "$x"; done

Bug: 755727
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I0da214ef2afbb6d41d1a14ee21ac91df34ddb2e2
Reviewed-on: https://chromium-review.googlesource.com/1007893
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550252}
  • Loading branch information
jeremyroman authored and Commit Bot committed Apr 12, 2018
1 parent 9eb8003 commit b25be97
Show file tree
Hide file tree
Showing 213 changed files with 0 additions and 213 deletions.
1 change: 0 additions & 1 deletion ui/accessibility/ax_tree_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include <memory>

#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <string>

#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/accessibility/ax_enums.mojom.h"
Expand Down
1 change: 0 additions & 1 deletion ui/android/delegated_frame_host_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "cc/layers/solid_color_layer.h"
#include "cc/layers/surface_layer.h"
#include "components/viz/common/features.h"
Expand Down
1 change: 0 additions & 1 deletion ui/android/resources/nine_patch_resource.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/android/resources/nine_patch_resource.h"

#include "base/memory/ptr_util.h"
#include "cc/layers/nine_patch_layer.h"
#include "ui/gfx/geometry/point_f.h"

Expand Down
1 change: 0 additions & 1 deletion ui/android/resources/resource.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/android/resources/resource.h"

#include "base/memory/ptr_util.h"
#include "base/trace_event/memory_usage_estimator.h"

namespace ui {
Expand Down
1 change: 0 additions & 1 deletion ui/android/resources/resource_manager_impl_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <stddef.h>

#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/trace_event/memory_dump_manager.h"
#include "base/trace_event/process_memory_dump.h"
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/app_list_view_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#include "ash/app_list/model/search/search_box_model.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/indicator_chip_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/app_list/views/indicator_chip_view.h"

#include "base/memory/ptr_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/views/background.h"
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/page_switcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "base/i18n/number_formatting.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "third_party/skia/include/core/SkPath.h"
#include "ui/app_list/app_list_constants.h"
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/pulsing_block_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include <vector>

#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/rand_util.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/compositor/layer.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <utility>

#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/unguessable_token.h"
#include "ui/accessibility/ax_node_data.h"
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/search_result_list_view_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

#include "ash/app_list/model/search/search_model.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/app_list/app_list_features.h"
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/search_result_page_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <algorithm>
#include <memory>

#include "base/memory/ptr_util.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_util.h"
#include "ui/app_list/app_list_view_delegate.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include "ash/app_list/model/app_list_model.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
Expand Down
1 change: 0 additions & 1 deletion ui/arc/notification/arc_notification_content_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "ash/wm/window_util.h"
#include "base/auto_reset.h"
#include "base/memory/ptr_util.h"
#include "components/exo/notification_surface.h"
#include "components/exo/surface.h"
#include "ui/accessibility/ax_node_data.h"
Expand Down
1 change: 0 additions & 1 deletion ui/arc/notification/arc_notification_item_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <vector>

#include "ash/shelf/shelf_constants.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/arc/notification/arc_notification_delegate.h"
Expand Down
1 change: 0 additions & 1 deletion ui/arc/notification/arc_notification_manager_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <utility>
#include <vector>

#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "components/arc/arc_bridge_service.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <string>
#include <utility>

#include "base/memory/ptr_util.h"
#include "components/exo/notification_surface.h"
#include "ui/arc/notification/arc_notification_surface_impl.h"

Expand Down
1 change: 0 additions & 1 deletion ui/arc/notification/arc_notification_view_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/strings/utf_string_conversions.h"
#include "third_party/skia/include/core/SkColor.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/env.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "base/command_line.h"
#include "base/lazy_instance.h"
#include "base/memory/ptr_util.h"
#include "base/threading/thread_local.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
#include "ui/aura/client/aura_constants.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/gestures/gesture_recognizer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "base/command_line.h"
#include "base/location.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/client_surface_embedder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/aura/mus/client_surface_embedder.h"

#include "base/memory/ptr_util.h"
#include "ui/aura/window.h"
#include "ui/gfx/geometry/dip_util.h"

Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/drag_drop_controller_mus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <vector>

#include "base/auto_reset.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/map.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/drag_drop_controller_mus_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <memory>

#include "base/callback_forward.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task_scheduler/post_task.h"
#include "base/threading/thread_task_runner_handle.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/input_method_mus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include <utility>

#include "base/memory/ptr_util.h"
#include "services/ui/public/interfaces/constants.mojom.h"
#include "services/ui/public/interfaces/ime/ime.mojom.h"
#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/mus_context_factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "ui/aura/mus/mus_context_factory.h"

#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "cc/base/switches.h"
#include "components/viz/common/gpu/context_provider.h"
#include "components/viz/host/renderer_settings_creation.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/os_exchange_data_provider_mus_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <memory>

#include "base/files/file_util.h"
#include "base/memory/ptr_util.h"
#include "base/pickle.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_task_environment.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/property_converter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/aura/mus/property_converter.h"

#include "base/memory/ptr_util.h"
#include "mojo/public/cpp/bindings/type_converter.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/user_activity_forwarder_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <vector>

#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "services/ui/common/task_runner_test_base.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/window_port_mus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/aura/mus/window_port_mus.h"

#include "base/memory/ptr_util.h"
#include "components/viz/client/local_surface_id_provider.h"
#include "components/viz/host/host_frame_sink_manager.h"
#include "ui/aura/client/aura_constants.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/window_tree_host_mus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/aura/mus/window_tree_host_mus.h"

#include "base/memory/ptr_util.h"
#include "ui/aura/env.h"
#include "ui/aura/mus/input_method_mus.h"
#include "ui/aura/mus/window_port_mus.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/mus/window_tree_host_mus_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/aura/mus/window_tree_host_mus.h"

#include "base/memory/ptr_util.h"
#include "ui/aura/mus/window_port_mus.h"
#include "ui/aura/mus/window_tree_host_mus_init_params.h"
#include "ui/aura/test/aura_mus_test_base.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/test/aura_test_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "ui/aura/test/aura_test_base.h"

#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "base/test/scoped_feature_list.h"
#include "ui/aura/client/window_parenting_client.h"
#include "ui/aura/mus/property_utils.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/test/aura_test_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "ui/aura/test/aura_test_helper.h"

#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "ui/aura/client/default_capture_client.h"
#include "ui/aura/client/focus_client.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/test/mus/test_window_tree_client_setup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/aura/test/mus/test_window_tree_client_setup.h"

#include "base/memory/ptr_util.h"
#include "ui/aura/mus/window_tree_client.h"
#include "ui/aura/test/mus/test_window_manager_client.h"
#include "ui/aura/test/mus/test_window_tree.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/window.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "base/callback.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
Expand Down
1 change: 0 additions & 1 deletion ui/aura/window_port_for_shutdown.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/aura/window_port_for_shutdown.h"

#include "base/memory/ptr_util.h"
#include "cc/trees/layer_tree_frame_sink.h"
#include "ui/aura/window.h"

Expand Down
1 change: 0 additions & 1 deletion ui/base/class_property_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
1 change: 0 additions & 1 deletion ui/base/cocoa/menu_controller.mm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "base/cancelable_callback.h"
#include "base/logging.h"
#include "base/mac/bind_objc_block.h"
#include "base/memory/ptr_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
#include "ui/base/accelerators/accelerator.h"
Expand Down
1 change: 0 additions & 1 deletion ui/base/dragdrop/os_exchange_data_provider_builder_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h"

#include "base/memory/ptr_util.h"
#include "ui/base/dragdrop/os_exchange_data_provider_mac.h"

namespace ui {
Expand Down
1 change: 0 additions & 1 deletion ui/base/dragdrop/os_exchange_data_provider_factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/base/dragdrop/os_exchange_data_provider_factory.h"

#include "base/memory/ptr_util.h"
#include "build/build_config.h"

#if defined(USE_X11)
Expand Down
1 change: 0 additions & 1 deletion ui/base/dragdrop/os_exchange_data_provider_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "base/i18n/file_util_icu.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/pickle.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_hdc.h"
Expand Down
1 change: 0 additions & 1 deletion ui/base/ime/input_method_chromeos.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "base/bind.h"
#include "base/i18n/char_iterator.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/third_party/icu/icu_utf.h"
Expand Down
1 change: 0 additions & 1 deletion ui/base/ime/linux/fake_input_method_context_factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/base/ime/linux/fake_input_method_context_factory.h"

#include "base/memory/ptr_util.h"
#include "ui/base/ime/linux/fake_input_method_context.h"

namespace ui {
Expand Down
1 change: 0 additions & 1 deletion ui/base/l10n/l10n_util_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "base/i18n/rtl.h"
#include "base/i18n/time_formatting.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
Expand Down
1 change: 0 additions & 1 deletion ui/base/models/list_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/observer_list.h"
#include "ui/base/models/list_model_observer.h"

Expand Down
1 change: 0 additions & 1 deletion ui/base/models/list_model_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "testing/gtest/include/gtest/gtest.h"

namespace ui {
Expand Down
1 change: 0 additions & 1 deletion ui/base/models/tree_node_iterator_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "ui/base/models/tree_node_iterator.h"

#include "base/bind.h"
#include "base/memory/ptr_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/models/tree_node_model.h"

Expand Down
1 change: 0 additions & 1 deletion ui/base/models/tree_node_model_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
Expand Down
1 change: 0 additions & 1 deletion ui/base/nine_image_painter_factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include <stddef.h>

#include "base/memory/ptr_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/nine_image_painter.h"

Expand Down
Loading

0 comments on commit b25be97

Please sign in to comment.