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

Side by Side Diff: components/test_runner/test_interfaces.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 unified diff | Download patch
« no previous file with comments | « components/test_runner/pixel_dump.cc ('k') | components/test_runner/test_plugin.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 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 #ifndef COMPONENTS_TEST_RUNNER_TEST_INTERFACES_H_ 5 #ifndef COMPONENTS_TEST_RUNNER_TEST_INTERFACES_H_
6 #define COMPONENTS_TEST_RUNNER_TEST_INTERFACES_H_ 6 #define COMPONENTS_TEST_RUNNER_TEST_INTERFACES_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "components/test_runner/mock_web_theme_engine.h" 13 #include "components/test_runner/mock_web_theme_engine.h"
14 #include "third_party/WebKit/public/platform/WebNonCopyable.h" 14 #include "third_party/WebKit/public/platform/WebNonCopyable.h"
15 15
16 namespace blink { 16 namespace blink {
17 class WebFrame; 17 class WebFrame;
18 class WebThemeEngine; 18 class WebThemeEngine;
19 class WebURL; 19 class WebURL;
20 class WebView; 20 class WebView;
21 } 21 }
(...skipping 25 matching lines...) Expand all
47 void WindowClosed(WebTestProxyBase* proxy); 47 void WindowClosed(WebTestProxyBase* proxy);
48 48
49 TestRunner* GetTestRunner(); 49 TestRunner* GetTestRunner();
50 WebTestDelegate* GetDelegate(); 50 WebTestDelegate* GetDelegate();
51 const std::vector<WebTestProxyBase*>& GetWindowList(); 51 const std::vector<WebTestProxyBase*>& GetWindowList();
52 blink::WebThemeEngine* GetThemeEngine(); 52 blink::WebThemeEngine* GetThemeEngine();
53 AppBannerClient* GetAppBannerClient(); 53 AppBannerClient* GetAppBannerClient();
54 54
55 private: 55 private:
56 base::WeakPtr<GamepadController> gamepad_controller_; 56 base::WeakPtr<GamepadController> gamepad_controller_;
57 scoped_ptr<TestRunner> test_runner_; 57 std::unique_ptr<TestRunner> test_runner_;
58 WebTestDelegate* delegate_; 58 WebTestDelegate* delegate_;
59 AppBannerClient* app_banner_client_; 59 AppBannerClient* app_banner_client_;
60 60
61 std::vector<WebTestProxyBase*> window_list_; 61 std::vector<WebTestProxyBase*> window_list_;
62 scoped_ptr<MockWebThemeEngine> theme_engine_; 62 std::unique_ptr<MockWebThemeEngine> theme_engine_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(TestInterfaces); 64 DISALLOW_COPY_AND_ASSIGN(TestInterfaces);
65 }; 65 };
66 66
67 } // namespace test_runner 67 } // namespace test_runner
68 68
69 #endif // COMPONENTS_TEST_RUNNER_TEST_INTERFACES_H_ 69 #endif // COMPONENTS_TEST_RUNNER_TEST_INTERFACES_H_
OLDNEW
« no previous file with comments | « components/test_runner/pixel_dump.cc ('k') | components/test_runner/test_plugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698