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

Unified Diff: components/test_runner/web_test_proxy.h

Issue 1921923002: Convert //components/[o-t]* 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/test_runner/web_test_interfaces.cc ('k') | components/timers/alarm_timer_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/test_runner/web_test_proxy.h
diff --git a/components/test_runner/web_test_proxy.h b/components/test_runner/web_test_proxy.h
index 53870f3831c4202878c2bde44bcef4cdae4ce669..c8d5c64b92bd545fe4c71a829c2fde95100dad91 100644
--- a/components/test_runner/web_test_proxy.h
+++ b/components/test_runner/web_test_proxy.h
@@ -5,12 +5,12 @@
#ifndef COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
#define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
+#include <memory>
#include <string>
#include <utility>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "components/test_runner/test_runner_export.h"
#include "components/test_runner/web_view_test_client.h"
@@ -69,7 +69,8 @@ class TEST_RUNNER_EXPORT WebTestProxyBase {
web_view_ = view;
}
- void set_view_test_client(scoped_ptr<WebViewTestClient> view_test_client) {
+ void set_view_test_client(
+ std::unique_ptr<WebViewTestClient> view_test_client) {
DCHECK(view_test_client);
DCHECK(!view_test_client_);
view_test_client_ = std::move(view_test_client);
@@ -108,10 +109,10 @@ class TEST_RUNNER_EXPORT WebTestProxyBase {
WebTestDelegate* delegate_;
blink::WebView* web_view_;
blink::WebWidget* web_widget_;
- scoped_ptr<WebViewTestClient> view_test_client_;
- scoped_ptr<AccessibilityController> accessibility_controller_;
- scoped_ptr<EventSender> event_sender_;
- scoped_ptr<TextInputController> text_input_controller_;
+ std::unique_ptr<WebViewTestClient> view_test_client_;
+ std::unique_ptr<AccessibilityController> accessibility_controller_;
+ std::unique_ptr<EventSender> event_sender_;
+ std::unique_ptr<TextInputController> text_input_controller_;
DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase);
};
« no previous file with comments | « components/test_runner/web_test_interfaces.cc ('k') | components/timers/alarm_timer_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698