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

Side by Side Diff: ui/views/test/webview_test_helper.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 unified diff | Download patch
« no previous file with comments | « ui/views/test/views_test_helper_mac.h ('k') | ui/views/test/x11_property_change_waiter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef UI_VIEWS_TEST_WEB_VIEW_TEST_HELPER_H_ 5 #ifndef UI_VIEWS_TEST_WEB_VIEW_TEST_HELPER_H_
6 #define UI_VIEWS_TEST_WEB_VIEW_TEST_HELPER_H_ 6 #define UI_VIEWS_TEST_WEB_VIEW_TEST_HELPER_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 11
11 namespace base { 12 namespace base {
12 class MessageLoopForUI; 13 class MessageLoopForUI;
13 } 14 }
14 15
15 namespace content { 16 namespace content {
16 class TestContentClientInitializer; 17 class TestContentClientInitializer;
17 } // namespace content 18 } // namespace content
18 19
19 namespace views { 20 namespace views {
20 21
21 class WebViewTestHelper { 22 class WebViewTestHelper {
22 public: 23 public:
23 WebViewTestHelper(); 24 WebViewTestHelper();
24 virtual ~WebViewTestHelper(); 25 virtual ~WebViewTestHelper();
25 26
26 private: 27 private:
27 scoped_ptr<content::TestContentClientInitializer> 28 std::unique_ptr<content::TestContentClientInitializer>
28 test_content_client_initializer_; 29 test_content_client_initializer_;
29 30
30 DISALLOW_COPY_AND_ASSIGN(WebViewTestHelper); 31 DISALLOW_COPY_AND_ASSIGN(WebViewTestHelper);
31 }; 32 };
32 33
33 } // namespace views 34 } // namespace views
34 35
35 #endif // UI_VIEWS_TEST_WEB_VIEW_TEST_HELPER_H_ 36 #endif // UI_VIEWS_TEST_WEB_VIEW_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ui/views/test/views_test_helper_mac.h ('k') | ui/views/test/x11_property_change_waiter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698