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

Side by Side Diff: content/test/test_blink_web_unit_test_support.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_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_ 5 #ifndef CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_
6 #define CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_ 6 #define CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 blink::WebString QueryLocalizedString(blink::WebLocalizedString::Name name, 48 blink::WebString QueryLocalizedString(blink::WebLocalizedString::Name name,
49 const blink::WebString& value) override; 49 const blink::WebString& value) override;
50 blink::WebString QueryLocalizedString( 50 blink::WebString QueryLocalizedString(
51 blink::WebLocalizedString::Name name, 51 blink::WebLocalizedString::Name name,
52 const blink::WebString& value1, 52 const blink::WebString& value1,
53 const blink::WebString& value2) override; 53 const blink::WebString& value2) override;
54 blink::WebString DefaultLocale() override; 54 blink::WebString DefaultLocale() override;
55 55
56 blink::WebCompositorSupport* CompositorSupport() override; 56 blink::WebCompositorSupport* CompositorSupport() override;
57 57
58 blink::WebGestureCurve* CreateFlingAnimationCurve( 58 std::unique_ptr<blink::WebGestureCurve> CreateFlingAnimationCurve(
59 blink::WebGestureDevice device_source, 59 blink::WebGestureDevice device_source,
60 const blink::WebFloatPoint& velocity, 60 const blink::WebFloatPoint& velocity,
61 const blink::WebSize& cumulative_scroll) override; 61 const blink::WebSize& cumulative_scroll) override;
62 62
63 blink::WebURLLoaderMockFactory* GetURLLoaderMockFactory() override; 63 blink::WebURLLoaderMockFactory* GetURLLoaderMockFactory() override;
64 64
65 blink::WebThread* CurrentThread() override; 65 blink::WebThread* CurrentThread() override;
66 66
67 std::unique_ptr<cc::SharedBitmap> AllocateSharedBitmap( 67 std::unique_ptr<cc::SharedBitmap> AllocateSharedBitmap(
68 const blink::WebSize& size) override; 68 const blink::WebSize& size) override;
69 69
70 void GetPluginList(bool refresh, 70 void GetPluginList(bool refresh,
71 const blink::WebSecurityOrigin& mainFrameOrigin, 71 const blink::WebSecurityOrigin& mainFrameOrigin,
72 blink::WebPluginListBuilder* builder) override; 72 blink::WebPluginListBuilder* builder) override;
73 73
74 blink::WebRTCCertificateGenerator* CreateRTCCertificateGenerator() override; 74 std::unique_ptr<blink::WebRTCCertificateGenerator>
75 CreateRTCCertificateGenerator() override;
75 76
76 private: 77 private:
77 MockWebBlobRegistryImpl blob_registry_; 78 MockWebBlobRegistryImpl blob_registry_;
78 std::unique_ptr<MockWebClipboardImpl> mock_clipboard_; 79 std::unique_ptr<MockWebClipboardImpl> mock_clipboard_;
79 WebFileUtilitiesImpl file_utilities_; 80 WebFileUtilitiesImpl file_utilities_;
80 base::ScopedTempDir file_system_root_; 81 base::ScopedTempDir file_system_root_;
81 std::unique_ptr<blink::WebURLLoaderMockFactory> url_loader_factory_; 82 std::unique_ptr<blink::WebURLLoaderMockFactory> url_loader_factory_;
82 cc_blink::WebCompositorSupportImpl compositor_support_; 83 cc_blink::WebCompositorSupportImpl compositor_support_;
83 std::unique_ptr<blink::scheduler::RendererScheduler> renderer_scheduler_; 84 std::unique_ptr<blink::scheduler::RendererScheduler> renderer_scheduler_;
84 std::unique_ptr<blink::WebThread> web_thread_; 85 std::unique_ptr<blink::WebThread> web_thread_;
85 std::unique_ptr<cc::TestSharedBitmapManager> shared_bitmap_manager_; 86 std::unique_ptr<cc::TestSharedBitmapManager> shared_bitmap_manager_;
86 87
87 DISALLOW_COPY_AND_ASSIGN(TestBlinkWebUnitTestSupport); 88 DISALLOW_COPY_AND_ASSIGN(TestBlinkWebUnitTestSupport);
88 }; 89 };
89 90
90 } // namespace content 91 } // namespace content
91 92
92 #endif // CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_ 93 #endif // CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_
OLDNEW
« no previous file with comments | « content/shell/test_runner/web_test_interfaces.cc ('k') | content/test/test_blink_web_unit_test_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698