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> |
| 6 |
5 #include "base/callback_list.h" | 7 #include "base/callback_list.h" |
6 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
7 #include "base/macros.h" | 9 #include "base/macros.h" |
8 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
9 #include "build/build_config.h" | 11 #include "build/build_config.h" |
10 #include "content/public/browser/content_browser_client.h" | 12 #include "content/public/browser/content_browser_client.h" |
11 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
12 #include "content/public/common/content_client.h" | 14 #include "content/public/common/content_client.h" |
13 #include "content/public/common/service_registry.h" | 15 #include "content/public/common/service_registry.h" |
14 #include "content/public/test/content_browser_test.h" | 16 #include "content/public/test/content_browser_test.h" |
(...skipping 26 matching lines...) Expand all Loading... |
41 | 43 |
42 // Updates the global battery state and notifies existing test monitors. | 44 // Updates the global battery state and notifies existing test monitors. |
43 void UpdateBattery(const device::BatteryStatus& battery_status) { | 45 void UpdateBattery(const device::BatteryStatus& battery_status) { |
44 g_battery_status = battery_status; | 46 g_battery_status = battery_status; |
45 g_callback_list.Get().Notify(battery_status); | 47 g_callback_list.Get().Notify(battery_status); |
46 } | 48 } |
47 | 49 |
48 class FakeBatteryMonitor : public device::BatteryMonitor { | 50 class FakeBatteryMonitor : public device::BatteryMonitor { |
49 public: | 51 public: |
50 static void Create(mojo::InterfaceRequest<BatteryMonitor> request) { | 52 static void Create(mojo::InterfaceRequest<BatteryMonitor> request) { |
51 new FakeBatteryMonitor(request.Pass()); | 53 new FakeBatteryMonitor(std::move(request)); |
52 } | 54 } |
53 | 55 |
54 private: | 56 private: |
55 typedef mojo::Callback<void(device::BatteryStatusPtr)> BatteryStatusCallback; | 57 typedef mojo::Callback<void(device::BatteryStatusPtr)> BatteryStatusCallback; |
56 | 58 |
57 FakeBatteryMonitor(mojo::InterfaceRequest<BatteryMonitor> request) | 59 FakeBatteryMonitor(mojo::InterfaceRequest<BatteryMonitor> request) |
58 : binding_(this, request.Pass()) { | 60 : binding_(this, std::move(request)) {} |
59 } | |
60 ~FakeBatteryMonitor() override {} | 61 ~FakeBatteryMonitor() override {} |
61 | 62 |
62 void QueryNextStatus(const BatteryStatusCallback& callback) override { | 63 void QueryNextStatus(const BatteryStatusCallback& callback) override { |
63 // We don't expect overlapped calls to QueryNextStatus. | 64 // We don't expect overlapped calls to QueryNextStatus. |
64 DCHECK(callback_.is_null()); | 65 DCHECK(callback_.is_null()); |
65 | 66 |
66 callback_ = callback; | 67 callback_ = callback; |
67 | 68 |
68 if (!subscription_) { | 69 if (!subscription_) { |
69 subscription_ = | 70 subscription_ = |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1); | 172 TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1); |
172 status.level = 0.6; | 173 status.level = 0.6; |
173 UpdateBattery(status); | 174 UpdateBattery(status); |
174 same_tab_observer2.Wait(); | 175 same_tab_observer2.Wait(); |
175 EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref()); | 176 EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref()); |
176 } | 177 } |
177 | 178 |
178 } // namespace | 179 } // namespace |
179 | 180 |
180 } // namespace content | 181 } // namespace content |
OLD | NEW |