diff options
36 files changed, 50 insertions, 49 deletions
diff --git a/chrome/browser/chromeos/chrome_interface_factory.h b/chrome/browser/chromeos/chrome_interface_factory.h index c141e8b..5b2da45 100644 --- a/chrome/browser/chromeos/chrome_interface_factory.h +++ b/chrome/browser/chromeos/chrome_interface_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_ #include "content/public/common/mojo_shell_connection.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "ui/keyboard/keyboard.mojom.h" diff --git a/chrome/browser/usb/web_usb_permission_bubble.h b/chrome/browser/usb/web_usb_permission_bubble.h index 18247541..687f2c0 100644 --- a/chrome/browser/usb/web_usb_permission_bubble.h +++ b/chrome/browser/usb/web_usb_permission_bubble.h @@ -10,9 +10,9 @@ #include "base/macros.h" #include "components/bubble/bubble_reference.h" #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/array.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace content { class RenderFrameHost; diff --git a/chrome/browser/usb/web_usb_permission_provider.h b/chrome/browser/usb/web_usb_permission_provider.h index 37889e0..a85d16a 100644 --- a/chrome/browser/usb/web_usb_permission_provider.h +++ b/chrome/browser/usb/web_usb_permission_provider.h @@ -8,9 +8,9 @@ #include <stdint.h> #include "device/usb/public/interfaces/permission_provider.mojom.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/array.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace content { class RenderFrameHost; diff --git a/components/font_service/font_service_app.h b/components/font_service/font_service_app.h index 6c2aeea..041d4f8 100644 --- a/components/font_service/font_service_app.h +++ b/components/font_service/font_service_app.h @@ -9,7 +9,7 @@ #include "base/macros.h" #include "components/font_service/public/interfaces/font_service.mojom.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "mojo/shell/public/cpp/shell_client.h" diff --git a/components/mus/mus_app.h b/components/mus/mus_app.h index 61f9632..956205f 100644 --- a/components/mus/mus_app.h +++ b/components/mus/mus_app.h @@ -17,7 +17,7 @@ #include "components/mus/public/interfaces/window_tree.mojom.h" #include "components/mus/public/interfaces/window_tree_host.mojom.h" #include "components/mus/ws/connection_manager_delegate.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "mojo/shell/public/cpp/shell_client.h" diff --git a/components/mus/ws/connection_manager.h b/components/mus/ws/connection_manager.h index 0b733b5..7266aa1 100644 --- a/components/mus/ws/connection_manager.h +++ b/components/mus/ws/connection_manager.h @@ -24,11 +24,11 @@ #include "components/mus/ws/server_window_delegate.h" #include "components/mus/ws/server_window_observer.h" #include "components/mus/ws/window_tree_host_impl.h" -#include "mojo/common/weak_binding_set.h" -#include "mojo/common/weak_interface_ptr_set.h" #include "mojo/converters/surfaces/custom_surface_converter.h" #include "mojo/public/cpp/bindings/array.h" #include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h" namespace mus { namespace ws { diff --git a/components/mus/ws/window_tree_factory.h b/components/mus/ws/window_tree_factory.h index 7e77773..859a810 100644 --- a/components/mus/ws/window_tree_factory.h +++ b/components/mus/ws/window_tree_factory.h @@ -7,7 +7,7 @@ #include "base/macros.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace mus { namespace ws { diff --git a/components/resource_provider/resource_provider_app.h b/components/resource_provider/resource_provider_app.h index 2d1dd4d..d5aa738 100644 --- a/components/resource_provider/resource_provider_app.h +++ b/components/resource_provider/resource_provider_app.h @@ -9,8 +9,8 @@ #include "base/macros.h" #include "components/resource_provider/public/interfaces/resource_provider.mojom.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "mojo/shell/public/cpp/shell_client.h" diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h index ae66513..0f53a01 100644 --- a/content/browser/frame_host/frame_mojo_shell.h +++ b/content/browser/frame_host/frame_mojo_shell.h @@ -7,8 +7,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/public/interfaces/shell.mojom.h" namespace content { diff --git a/content/browser/vr/vr_device_manager.h b/content/browser/vr/vr_device_manager.h index 4eb39ea..5fa84e8 100644 --- a/content/browser/vr/vr_device_manager.h +++ b/content/browser/vr/vr_device_manager.h @@ -18,7 +18,7 @@ #include "content/browser/vr/vr_device_provider.h" #include "content/common/content_export.h" #include "content/common/vr_service.mojom.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace content { diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h index 816410d..b83ff79 100644 --- a/content/gpu/gpu_child_thread.h +++ b/content/gpu/gpu_child_thread.h @@ -23,8 +23,8 @@ #include "content/common/gpu/x_util.h" #include "content/common/process_control.mojom.h" #include "gpu/config/gpu_info.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "ui/gfx/native_widget_types.h" namespace gpu { diff --git a/content/renderer/mus/render_widget_window_tree_client_factory.cc b/content/renderer/mus/render_widget_window_tree_client_factory.cc index 7383c7a..9ff3538 100644 --- a/content/renderer/mus/render_widget_window_tree_client_factory.cc +++ b/content/renderer/mus/render_widget_window_tree_client_factory.cc @@ -12,7 +12,7 @@ #include "content/common/render_widget_window_tree_client_factory.mojom.h" #include "content/public/common/mojo_shell_connection.h" #include "content/renderer/mus/render_widget_mus_connection.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/public/cpp/connection.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "url/gurl.h" diff --git a/content/utility/utility_thread_impl.h b/content/utility/utility_thread_impl.h index 415b2af..fef34a6 100644 --- a/content/utility/utility_thread_impl.h +++ b/content/utility/utility_thread_impl.h @@ -16,7 +16,7 @@ #include "content/common/content_export.h" #include "content/common/process_control.mojom.h" #include "content/public/utility/utility_thread.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace base { class FilePath; diff --git a/device/usb/mojo/fake_permission_provider.h b/device/usb/mojo/fake_permission_provider.h index 22292ee..a1da1b0 100644 --- a/device/usb/mojo/fake_permission_provider.h +++ b/device/usb/mojo/fake_permission_provider.h @@ -8,9 +8,9 @@ #include <stdint.h> #include "device/usb/public/interfaces/permission_provider.mojom.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/array.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace device { namespace usb { diff --git a/mash/screenlock/screenlock.h b/mash/screenlock/screenlock.h index 3d6bfb6..60c8999 100644 --- a/mash/screenlock/screenlock.h +++ b/mash/screenlock/screenlock.h @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "mash/shell/public/interfaces/shell.mojom.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" #include "mojo/shell/public/cpp/shell_client.h" diff --git a/mash/shell/shell_application_delegate.h b/mash/shell/shell_application_delegate.h index b8cb184..89ddbda 100644 --- a/mash/shell/shell_application_delegate.h +++ b/mash/shell/shell_application_delegate.h @@ -11,8 +11,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "mash/shell/public/interfaces/shell.mojom.h" -#include "mojo/common/weak_binding_set.h" -#include "mojo/common/weak_interface_ptr_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "mojo/shell/public/cpp/shell_client.h" diff --git a/mash/wm/accelerator_registrar_impl.h b/mash/wm/accelerator_registrar_impl.h index 94a16c2..fe470c6 100644 --- a/mash/wm/accelerator_registrar_impl.h +++ b/mash/wm/accelerator_registrar_impl.h @@ -13,8 +13,8 @@ #include "base/macros.h" #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" #include "mash/wm/root_windows_observer.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace mash { namespace wm { diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h index f5ef9e1..d8356f7 100644 --- a/mash/wm/window_manager_application.h +++ b/mash/wm/window_manager_application.h @@ -18,8 +18,8 @@ #include "components/mus/public/interfaces/window_manager_factory.mojom.h" #include "components/mus/public/interfaces/window_tree_host.mojom.h" #include "mash/wm/public/interfaces/user_window_controller.mojom.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" #include "mojo/shell/public/cpp/shell_client.h" diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn index 4f3d8f7..6a12118 100644 --- a/mojo/common/BUILD.gn +++ b/mojo/common/BUILD.gn @@ -25,8 +25,6 @@ component("common_base") { "data_pipe_utils.h", "user_agent.cc", "user_agent.h", - "weak_binding_set.h", - "weak_interface_ptr_set.h", ] defines = [ "MOJO_COMMON_IMPLEMENTATION" ] diff --git a/mojo/mojo_public.gyp b/mojo/mojo_public.gyp index 906119a..ae71826 100644 --- a/mojo/mojo_public.gyp +++ b/mojo/mojo_public.gyp @@ -174,6 +174,8 @@ 'public/cpp/bindings/string.h', 'public/cpp/bindings/strong_binding.h', 'public/cpp/bindings/type_converter.h', + 'public/cpp/bindings/weak_binding_set.h', + 'public/cpp/bindings/weak_interface_ptr_set.h', # This comes from the mojo_interface_bindings_cpp_sources dependency. '>@(mojom_generated_sources)', ], diff --git a/mojo/public/cpp/bindings/BUILD.gn b/mojo/public/cpp/bindings/BUILD.gn index 6d9acd3..126db8e 100644 --- a/mojo/public/cpp/bindings/BUILD.gn +++ b/mojo/public/cpp/bindings/BUILD.gn @@ -82,6 +82,8 @@ source_set("bindings") { "struct_ptr.h", "struct_traits.h", "type_converter.h", + "weak_binding_set.h", + "weak_interface_ptr_set.h", ] public_deps = [ diff --git a/mojo/public/cpp/bindings/tests/BUILD.gn b/mojo/public/cpp/bindings/tests/BUILD.gn index 33610fd..e538809 100644 --- a/mojo/public/cpp/bindings/tests/BUILD.gn +++ b/mojo/public/cpp/bindings/tests/BUILD.gn @@ -48,7 +48,6 @@ source_set("tests") { deps = [ ":mojo_public_bindings_test_utils", - "//mojo/common", "//mojo/environment:chromium", "//mojo/message_pump", "//mojo/public/cpp/bindings", diff --git a/mojo/public/cpp/bindings/tests/pickle_unittest.cc b/mojo/public/cpp/bindings/tests/pickle_unittest.cc index cf10b99..a0d7a2e 100644 --- a/mojo/public/cpp/bindings/tests/pickle_unittest.cc +++ b/mojo/public/cpp/bindings/tests/pickle_unittest.cc @@ -9,10 +9,10 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/cpp/bindings/tests/pickled_struct_blink.h" #include "mojo/public/cpp/bindings/tests/pickled_struct_chromium.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/public/interfaces/bindings/tests/test_native_types.mojom-blink.h" #include "mojo/public/interfaces/bindings/tests/test_native_types.mojom-chromium.h" #include "mojo/public/interfaces/bindings/tests/test_native_types.mojom.h" diff --git a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc index d924c5c..07d7750 100644 --- a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc +++ b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc @@ -7,10 +7,10 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/cpp/bindings/tests/rect_blink.h" #include "mojo/public/cpp/bindings/tests/rect_chromium.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/public/interfaces/bindings/tests/test_native_types.mojom-blink.h" #include "mojo/public/interfaces/bindings/tests/test_native_types.mojom-chromium.h" #include "mojo/public/interfaces/bindings/tests/test_native_types.mojom.h" diff --git a/mojo/common/weak_binding_set.h b/mojo/public/cpp/bindings/weak_binding_set.h index 6485c4f..bf06a28 100644 --- a/mojo/common/weak_binding_set.h +++ b/mojo/public/cpp/bindings/weak_binding_set.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_COMMON_WEAK_BINDING_SET_H_ -#define MOJO_COMMON_WEAK_BINDING_SET_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_WEAK_BINDING_SET_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_WEAK_BINDING_SET_H_ #include <algorithm> #include <utility> @@ -32,8 +32,7 @@ class WeakBindingSet { error_handler_ = error_handler; } - void AddBinding(Interface* impl, - InterfaceRequest<GenericInterface> request) { + void AddBinding(Interface* impl, InterfaceRequest<GenericInterface> request) { auto binding = new WeakBinding<Interface>(impl, std::move(request)); binding->set_connection_error_handler([this]() { OnConnectionError(); }); bindings_.push_back(binding->GetWeakPtr()); @@ -65,8 +64,8 @@ class WeakBindingSet { bindings_.erase( std::remove_if(bindings_.begin(), bindings_.end(), [](const base::WeakPtr<WeakBinding<Interface>>& p) { - return p.get() == nullptr; - }), + return p.get() == nullptr; + }), bindings_.end()); error_handler_.Run(); @@ -116,4 +115,4 @@ class WeakBinding { } // namespace mojo -#endif // MOJO_COMMON_WEAK_BINDING_SET_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_WEAK_BINDING_SET_H_ diff --git a/mojo/common/weak_interface_ptr_set.h b/mojo/public/cpp/bindings/weak_interface_ptr_set.h index 9e50eb2..f92a5ed 100644 --- a/mojo/common/weak_interface_ptr_set.h +++ b/mojo/public/cpp/bindings/weak_interface_ptr_set.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_COMMON_WEAK_INTERFACE_PTR_SET_H_ -#define MOJO_COMMON_WEAK_INTERFACE_PTR_SET_H_ +#ifndef MOJO_PUBLIC_CPP_BINDINGS_WEAK_INTERFACE_PTR_SET_H_ +#define MOJO_PUBLIC_CPP_BINDINGS_WEAK_INTERFACE_PTR_SET_H_ #include <utility> #include <vector> @@ -50,9 +50,10 @@ class WeakInterfacePtrSet { using WPWIPI = base::WeakPtr<WeakInterfacePtr<Interface>>; void ClearNullInterfacePtrs() { - ptrs_.erase(std::remove_if(ptrs_.begin(), ptrs_.end(), [](const WPWIPI& p) { - return p.get() == nullptr; - }), ptrs_.end()); + ptrs_.erase( + std::remove_if(ptrs_.begin(), ptrs_.end(), + [](const WPWIPI& p) { return p.get() == nullptr; }), + ptrs_.end()); } std::vector<WPWIPI> ptrs_; @@ -84,4 +85,4 @@ class WeakInterfacePtr { } // namespace mojo -#endif // MOJO_COMMON_WEAK_INTERFACE_PTR_SET_H_ +#endif // MOJO_PUBLIC_CPP_BINDINGS_WEAK_INTERFACE_PTR_SET_H_ diff --git a/mojo/services/tracing/tracing_app.h b/mojo/services/tracing/tracing_app.h index 8f14dcb9..edb189e 100644 --- a/mojo/services/tracing/tracing_app.h +++ b/mojo/services/tracing/tracing_app.h @@ -10,9 +10,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "mojo/common/weak_binding_set.h" -#include "mojo/common/weak_interface_ptr_set.h" #include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h" #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" #include "mojo/services/tracing/trace_data_sink.h" #include "mojo/services/tracing/trace_recorder_impl.h" diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h index 36471c8..a3b079b 100644 --- a/mojo/shell/application_manager.h +++ b/mojo/shell/application_manager.h @@ -12,9 +12,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "mojo/common/weak_interface_ptr_set.h" #include "mojo/public/cpp/bindings/interface_ptr_info.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/capability_filter.h" #include "mojo/shell/connect_to_application_params.h" diff --git a/mojo/shell/application_manager_apptest.cc b/mojo/shell/application_manager_apptest.cc index 01af33e..9fbfdf9 100644 --- a/mojo/shell/application_manager_apptest.cc +++ b/mojo/shell/application_manager_apptest.cc @@ -11,8 +11,8 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/process/process_handle.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/converters/network/network_type_converters.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/application_manager_apptests.mojom.h" #include "mojo/shell/public/cpp/application_test_base.h" #include "mojo/shell/public/cpp/interface_factory.h" diff --git a/mojo/shell/application_manager_apptest_driver.cc b/mojo/shell/application_manager_apptest_driver.cc index 7fe76a0..2ac6584 100644 --- a/mojo/shell/application_manager_apptest_driver.cc +++ b/mojo/shell/application_manager_apptest_driver.cc @@ -18,11 +18,11 @@ #include "base/path_service.h" #include "base/process/process.h" #include "base/thread_task_runner_handle.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/converters/network/network_type_converters.h" #include "mojo/edk/embedder/embedder.h" #include "mojo/edk/embedder/platform_channel_pair.h" #include "mojo/edk/embedder/scoped_platform_handle.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/application_manager_apptests.mojom.h" #include "mojo/shell/public/cpp/connection.h" #include "mojo/shell/public/cpp/interface_factory.h" diff --git a/mojo/shell/application_package_apptest.cc b/mojo/shell/application_package_apptest.cc index 5b03417..333ab70 100644 --- a/mojo/shell/application_package_apptest.cc +++ b/mojo/shell/application_package_apptest.cc @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/threading/simple_thread.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/application_package_apptest.mojom.h" #include "mojo/shell/public/cpp/application_runner.h" #include "mojo/shell/public/cpp/application_test_base.h" diff --git a/mojo/shell/capability_filter_test.cc b/mojo/shell/capability_filter_test.cc index 4f2c86f..0db5169 100644 --- a/mojo/shell/capability_filter_test.cc +++ b/mojo/shell/capability_filter_test.cc @@ -9,8 +9,8 @@ #include "base/macros.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/package_manager.h" #include "mojo/shell/public/cpp/connection.h" diff --git a/mojo/shell/fetcher/about_fetcher_unittest.cc b/mojo/shell/fetcher/about_fetcher_unittest.cc index ea6e926..96853f0 100644 --- a/mojo/shell/fetcher/about_fetcher_unittest.cc +++ b/mojo/shell/fetcher/about_fetcher_unittest.cc @@ -14,7 +14,7 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/application_manager.h" #include "mojo/shell/package_manager/package_manager_impl.h" diff --git a/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc b/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc index ac8e1ed..832515d 100644 --- a/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc +++ b/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc @@ -8,7 +8,7 @@ #include "base/macros.h" #include "base/path_service.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/capability_filter_test.h" #include "mojo/shell/fetcher.h" #include "mojo/shell/package_manager/package_manager_impl.h" diff --git a/mojo/shell/runner/child/native_apptest_target.cc b/mojo/shell/runner/child/native_apptest_target.cc index 86043d1..5f322d7 100644 --- a/mojo/shell/runner/child/native_apptest_target.cc +++ b/mojo/shell/runner/child/native_apptest_target.cc @@ -7,7 +7,7 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/macros.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/public/cpp/connection.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "mojo/shell/public/cpp/shell.h" diff --git a/mojo/shell/shell_application_delegate.h b/mojo/shell/shell_application_delegate.h index fcc3260..4f0a558 100644 --- a/mojo/shell/shell_application_delegate.h +++ b/mojo/shell/shell_application_delegate.h @@ -8,7 +8,7 @@ #include <stdint.h> #include "base/macros.h" -#include "mojo/common/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "mojo/shell/public/cpp/shell_client.h" #include "mojo/shell/public/interfaces/application_manager.mojom.h" |