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

Unified Diff: ui/views/controls/native/native_view_host_test_base.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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: ui/views/controls/native/native_view_host_test_base.h
diff --git a/ui/views/controls/native/native_view_host_test_base.h b/ui/views/controls/native/native_view_host_test_base.h
index f663956da6179e68be859bb5a03dee9b707dfdd1..ad39c162d15b21e354fe1739c1b6930d9cd26d76 100644
--- a/ui/views/controls/native/native_view_host_test_base.h
+++ b/ui/views/controls/native/native_view_host_test_base.h
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/views/test/views_test_base.h"
namespace views {
@@ -54,8 +55,8 @@ class NativeViewHostTestBase : public ViewsTestBase {
private:
class NativeViewHostTesting;
- scoped_ptr<Widget> toplevel_;
- scoped_ptr<NativeViewHost> host_;
+ std::unique_ptr<Widget> toplevel_;
+ std::unique_ptr<NativeViewHost> host_;
int host_destroyed_count_;
DISALLOW_COPY_AND_ASSIGN(NativeViewHostTestBase);
« no previous file with comments | « ui/views/controls/native/native_view_host_mac_unittest.mm ('k') | ui/views/controls/native/native_view_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698