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

Unified Diff: ios/web/public/test/scoped_testing_web_client.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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
Index: ios/web/public/test/scoped_testing_web_client.h
diff --git a/ios/web/public/test/scoped_testing_web_client.h b/ios/web/public/test/scoped_testing_web_client.h
index 51f7969f41e5d0560e009d56f162782ff4b946ae..65a221e2570564d335d33f8818ad70b820493983 100644
--- a/ios/web/public/test/scoped_testing_web_client.h
+++ b/ios/web/public/test/scoped_testing_web_client.h
@@ -5,8 +5,9 @@
#ifndef IOS_WEB_PUBLIC_TEST_SCOPED_TESTING_WEB_CLIENT_H_
#define IOS_WEB_PUBLIC_TEST_SCOPED_TESTING_WEB_CLIENT_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace web {
@@ -15,13 +16,13 @@ class WebClient;
// Helper class to register a WebClient during unit testing.
class ScopedTestingWebClient {
public:
- explicit ScopedTestingWebClient(scoped_ptr<WebClient> web_client);
+ explicit ScopedTestingWebClient(std::unique_ptr<WebClient> web_client);
~ScopedTestingWebClient();
WebClient* Get();
private:
- scoped_ptr<WebClient> web_client_;
+ std::unique_ptr<WebClient> web_client_;
WebClient* original_web_client_;
};

Powered by Google App Engine
This is Rietveld 408576698