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

Side by Side Diff: content/shell/test_runner/web_test_interfaces.h

Issue 2846843002: [blink] Unique pointers in Platform.h (Closed)
Patch Set: fix compilation (and again) Created 3 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_SHELL_TEST_RUNNER_WEB_TEST_INTERFACES_H_ 5 #ifndef CONTENT_SHELL_TEST_RUNNER_WEB_TEST_INTERFACES_H_
6 #define CONTENT_SHELL_TEST_RUNNER_WEB_TEST_INTERFACES_H_ 6 #define CONTENT_SHELL_TEST_RUNNER_WEB_TEST_INTERFACES_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 void SetDelegate(WebTestDelegate* delegate); 46 void SetDelegate(WebTestDelegate* delegate);
47 void ResetAll(); 47 void ResetAll();
48 bool TestIsRunning(); 48 bool TestIsRunning();
49 void SetTestIsRunning(bool running); 49 void SetTestIsRunning(bool running);
50 void ConfigureForTestWithURL(const blink::WebURL& test_url, 50 void ConfigureForTestWithURL(const blink::WebURL& test_url,
51 bool generate_pixels); 51 bool generate_pixels);
52 52
53 WebTestRunner* TestRunner(); 53 WebTestRunner* TestRunner();
54 blink::WebThemeEngine* ThemeEngine(); 54 blink::WebThemeEngine* ThemeEngine();
55 55
56 blink::WebMediaStreamCenter* CreateMediaStreamCenter( 56 std::unique_ptr<blink::WebMediaStreamCenter> CreateMediaStreamCenter(
57 blink::WebMediaStreamCenterClient* client); 57 blink::WebMediaStreamCenterClient* client);
58 blink::WebRTCPeerConnectionHandler* CreateWebRTCPeerConnectionHandler( 58 std::unique_ptr<blink::WebRTCPeerConnectionHandler>
59 CreateWebRTCPeerConnectionHandler(
59 blink::WebRTCPeerConnectionHandlerClient* client); 60 blink::WebRTCPeerConnectionHandlerClient* client);
60 61
61 blink::WebMIDIAccessor* CreateMIDIAccessor( 62 std::unique_ptr<blink::WebMIDIAccessor> CreateMIDIAccessor(
62 blink::WebMIDIAccessorClient* client); 63 blink::WebMIDIAccessorClient* client);
63 64
64 blink::WebAudioDevice* CreateAudioDevice(double sample_rate, 65 std::unique_ptr<blink::WebAudioDevice> CreateAudioDevice(
65 int frames_per_buffer); 66 double sample_rate,
67 int frames_per_buffer);
66 68
67 TestInterfaces* GetTestInterfaces(); 69 TestInterfaces* GetTestInterfaces();
68 70
69 // Creates a WebFrameClient implementation providing test behavior (i.e. 71 // Creates a WebFrameClient implementation providing test behavior (i.e.
70 // forwarding javascript console output to the test harness). The caller 72 // forwarding javascript console output to the test harness). The caller
71 // should guarantee that the returned object won't be used beyond the lifetime 73 // should guarantee that the returned object won't be used beyond the lifetime
72 // of WebTestInterfaces and/or the lifetime of |web_view_test_proxy_base|. 74 // of WebTestInterfaces and/or the lifetime of |web_view_test_proxy_base|.
73 std::unique_ptr<WebFrameTestClient> CreateWebFrameTestClient( 75 std::unique_ptr<WebFrameTestClient> CreateWebFrameTestClient(
74 WebViewTestProxyBase* web_view_test_proxy_base, 76 WebViewTestProxyBase* web_view_test_proxy_base,
75 WebFrameTestProxyBase* web_frame_test_proxy_base); 77 WebFrameTestProxyBase* web_frame_test_proxy_base);
(...skipping 17 matching lines...) Expand all
93 95
94 private: 96 private:
95 std::unique_ptr<TestInterfaces> interfaces_; 97 std::unique_ptr<TestInterfaces> interfaces_;
96 98
97 DISALLOW_COPY_AND_ASSIGN(WebTestInterfaces); 99 DISALLOW_COPY_AND_ASSIGN(WebTestInterfaces);
98 }; 100 };
99 101
100 } // namespace test_runner 102 } // namespace test_runner
101 103
102 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_TEST_INTERFACES_H_ 104 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_TEST_INTERFACES_H_
OLDNEW
« no previous file with comments | « content/shell/test_runner/test_plugin.cc ('k') | content/shell/test_runner/web_test_interfaces.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698