Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Side by Side Diff: content/browser/battery_status/battery_monitor_integration_browsertest.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 } 75 }
76 } 76 }
77 77
78 void DidChange(const device::BatteryStatus& battery_status) { 78 void DidChange(const device::BatteryStatus& battery_status) {
79 if (!callback_.is_null()) { 79 if (!callback_.is_null()) {
80 callback_.Run(battery_status.Clone()); 80 callback_.Run(battery_status.Clone());
81 callback_.reset(); 81 callback_.reset();
82 } 82 }
83 } 83 }
84 84
85 scoped_ptr<BatteryUpdateSubscription> subscription_; 85 std::unique_ptr<BatteryUpdateSubscription> subscription_;
86 mojo::StrongBinding<BatteryMonitor> binding_; 86 mojo::StrongBinding<BatteryMonitor> binding_;
87 BatteryStatusCallback callback_; 87 BatteryStatusCallback callback_;
88 }; 88 };
89 89
90 // Overrides the default service implementation with the test implementation 90 // Overrides the default service implementation with the test implementation
91 // declared above. 91 // declared above.
92 class TestContentBrowserClient : public ContentBrowserClient { 92 class TestContentBrowserClient : public ContentBrowserClient {
93 public: 93 public:
94 void RegisterRenderProcessMojoServices(ServiceRegistry* registry) override { 94 void RegisterRenderProcessMojoServices(ServiceRegistry* registry) override {
95 registry->AddService(base::Bind(&FakeBatteryMonitor::Create)); 95 registry->AddService(base::Bind(&FakeBatteryMonitor::Create));
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698