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

Side by Side Diff: content/test/test_blink_web_unit_test_support.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent 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
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>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "cc/blink/web_compositor_support_impl.h" 14 #include "cc/blink/web_compositor_support_impl.h"
14 #include "content/child/blink_platform_impl.h" 15 #include "content/child/blink_platform_impl.h"
15 #include "content/child/simple_webmimeregistry_impl.h" 16 #include "content/child/simple_webmimeregistry_impl.h"
16 #include "content/child/webfileutilities_impl.h" 17 #include "content/child/webfileutilities_impl.h"
17 #include "content/test/mock_webblob_registry_impl.h" 18 #include "content/test/mock_webblob_registry_impl.h"
18 #include "content/test/mock_webclipboard_impl.h" 19 #include "content/test/mock_webclipboard_impl.h"
19 #include "third_party/WebKit/public/platform/WebURLLoaderMockFactory.h" 20 #include "third_party/WebKit/public/platform/WebURLLoaderMockFactory.h"
20 21
21 namespace base { 22 namespace base {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 blink::WebURLLoaderMockFactory* getURLLoaderMockFactory() override; 73 blink::WebURLLoaderMockFactory* getURLLoaderMockFactory() override;
73 74
74 blink::WebThread* currentThread() override; 75 blink::WebThread* currentThread() override;
75 76
76 void getPluginList(bool refresh, 77 void getPluginList(bool refresh,
77 blink::WebPluginListBuilder* builder) override; 78 blink::WebPluginListBuilder* builder) override;
78 79
79 private: 80 private:
80 MockWebBlobRegistryImpl blob_registry_; 81 MockWebBlobRegistryImpl blob_registry_;
81 SimpleWebMimeRegistryImpl mime_registry_; 82 SimpleWebMimeRegistryImpl mime_registry_;
82 scoped_ptr<MockWebClipboardImpl> mock_clipboard_; 83 std::unique_ptr<MockWebClipboardImpl> mock_clipboard_;
83 WebFileUtilitiesImpl file_utilities_; 84 WebFileUtilitiesImpl file_utilities_;
84 base::ScopedTempDir file_system_root_; 85 base::ScopedTempDir file_system_root_;
85 scoped_ptr<blink::WebURLLoaderMockFactory> url_loader_factory_; 86 std::unique_ptr<blink::WebURLLoaderMockFactory> url_loader_factory_;
86 cc_blink::WebCompositorSupportImpl compositor_support_; 87 cc_blink::WebCompositorSupportImpl compositor_support_;
87 scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_; 88 std::unique_ptr<scheduler::RendererScheduler> renderer_scheduler_;
88 scoped_ptr<blink::WebThread> web_thread_; 89 std::unique_ptr<blink::WebThread> web_thread_;
89 90
90 #if defined(OS_WIN) || defined(OS_MACOSX) 91 #if defined(OS_WIN) || defined(OS_MACOSX)
91 blink::WebThemeEngine* active_theme_engine_ = nullptr; 92 blink::WebThemeEngine* active_theme_engine_ = nullptr;
92 #endif 93 #endif
93 DISALLOW_COPY_AND_ASSIGN(TestBlinkWebUnitTestSupport); 94 DISALLOW_COPY_AND_ASSIGN(TestBlinkWebUnitTestSupport);
94 }; 95 };
95 96
96 } // namespace content 97 } // namespace content
97 98
98 #endif // CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_ 99 #endif // CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_
OLDNEW
« no previous file with comments | « content/test/test_background_sync_manager.h ('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