| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <utility> | 5 #include <utility> |
| 6 | 6 |
| 7 #include "base/callback_list.h" | 7 #include "base/callback_list.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 #include "content/public/browser/content_browser_client.h" | 12 #include "content/public/browser/content_browser_client.h" |
| 13 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
| 14 #include "content/public/common/content_client.h" | 14 #include "content/public/common/content_client.h" |
| 15 #include "content/public/common/service_registry.h" | |
| 16 #include "content/public/test/content_browser_test.h" | 15 #include "content/public/test/content_browser_test.h" |
| 17 #include "content/public/test/content_browser_test_utils.h" | 16 #include "content/public/test/content_browser_test_utils.h" |
| 18 #include "content/public/test/test_navigation_observer.h" | 17 #include "content/public/test/test_navigation_observer.h" |
| 19 #include "content/public/test/test_utils.h" | 18 #include "content/public/test/test_utils.h" |
| 20 #include "content/shell/browser/shell.h" | 19 #include "content/shell/browser/shell.h" |
| 21 #include "content/shell/browser/shell_content_browser_client.h" | 20 #include "content/shell/browser/shell_content_browser_client.h" |
| 22 #include "device/battery/battery_monitor.mojom.h" | 21 #include "device/battery/battery_monitor.mojom.h" |
| 23 #include "mojo/public/cpp/bindings/strong_binding.h" | 22 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 23 #include "services/shell/public/cpp/interface_registry.h" |
| 24 | 24 |
| 25 // These tests run against a dummy implementation of the BatteryMonitor service. | 25 // These tests run against a dummy implementation of the BatteryMonitor service. |
| 26 // That is, they verify that the service implementation is correctly exposed to | 26 // That is, they verify that the service implementation is correctly exposed to |
| 27 // the renderer, whatever the implementation is. | 27 // the renderer, whatever the implementation is. |
| 28 | 28 |
| 29 namespace content { | 29 namespace content { |
| 30 | 30 |
| 31 namespace { | 31 namespace { |
| 32 | 32 |
| 33 typedef base::CallbackList<void(const device::BatteryStatus&)> | 33 typedef base::CallbackList<void(const device::BatteryStatus&)> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 82 |
| 83 std::unique_ptr<BatteryUpdateSubscription> subscription_; | 83 std::unique_ptr<BatteryUpdateSubscription> subscription_; |
| 84 mojo::StrongBinding<BatteryMonitor> binding_; | 84 mojo::StrongBinding<BatteryMonitor> binding_; |
| 85 QueryNextStatusCallback callback_; | 85 QueryNextStatusCallback callback_; |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 // Overrides the default service implementation with the test implementation | 88 // Overrides the default service implementation with the test implementation |
| 89 // declared above. | 89 // declared above. |
| 90 class TestContentBrowserClient : public ContentBrowserClient { | 90 class TestContentBrowserClient : public ContentBrowserClient { |
| 91 public: | 91 public: |
| 92 void RegisterRenderProcessMojoServices( | 92 void ExposeInterfacesToRenderer( |
| 93 ServiceRegistry* registry, | 93 shell::InterfaceRegistry* registry, |
| 94 RenderProcessHost* render_process_host) override { | 94 RenderProcessHost* render_process_host) override { |
| 95 registry->AddService(base::Bind(&FakeBatteryMonitor::Create)); | 95 registry->AddInterface(base::Bind(&FakeBatteryMonitor::Create)); |
| 96 } | 96 } |
| 97 | 97 |
| 98 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, | 98 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, |
| 99 int child_process_id) override { | 99 int child_process_id) override { |
| 100 // Necessary for passing kIsolateSitesForTesting flag to the renderer. | 100 // Necessary for passing kIsolateSitesForTesting flag to the renderer. |
| 101 ShellContentBrowserClient::Get()->AppendExtraCommandLineSwitches( | 101 ShellContentBrowserClient::Get()->AppendExtraCommandLineSwitches( |
| 102 command_line, child_process_id); | 102 command_line, child_process_id); |
| 103 } | 103 } |
| 104 | 104 |
| 105 #if defined(OS_ANDROID) | 105 #if defined(OS_ANDROID) |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1); | 179 TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1); |
| 180 status.level = 0.6; | 180 status.level = 0.6; |
| 181 UpdateBattery(status); | 181 UpdateBattery(status); |
| 182 same_tab_observer2.Wait(); | 182 same_tab_observer2.Wait(); |
| 183 EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref()); | 183 EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref()); |
| 184 } | 184 } |
| 185 | 185 |
| 186 } // namespace | 186 } // namespace |
| 187 | 187 |
| 188 } // namespace content | 188 } // namespace content |
| OLD | NEW |