OLD | NEW |
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 CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ |
6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ | 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_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 #include "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "content/shell/browser/shell_browser_main_parts.h" | 12 #include "content/shell/browser/shell_browser_main_parts.h" |
12 | 13 |
13 #if defined(OS_ANDROID) | 14 #if defined(OS_ANDROID) |
14 namespace breakpad { | 15 namespace breakpad { |
15 class CrashDumpManager; | 16 class CrashDumpManager; |
16 } | 17 } |
17 #endif | 18 #endif |
18 | 19 |
19 namespace base { | 20 namespace base { |
(...skipping 11 matching lines...) Expand all Loading... |
31 class LayoutTestBrowserMainParts : public ShellBrowserMainParts { | 32 class LayoutTestBrowserMainParts : public ShellBrowserMainParts { |
32 public: | 33 public: |
33 explicit LayoutTestBrowserMainParts(const MainFunctionParams& parameters); | 34 explicit LayoutTestBrowserMainParts(const MainFunctionParams& parameters); |
34 ~LayoutTestBrowserMainParts() override; | 35 ~LayoutTestBrowserMainParts() override; |
35 | 36 |
36 private: | 37 private: |
37 void InitializeBrowserContexts() override; | 38 void InitializeBrowserContexts() override; |
38 void InitializeMessageLoopContext() override; | 39 void InitializeMessageLoopContext() override; |
39 | 40 |
40 #if defined(ENABLE_PLUGINS) | 41 #if defined(ENABLE_PLUGINS) |
41 scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_; | 42 std::unique_ptr<ShellPluginServiceFilter> plugin_service_filter_; |
42 #endif | 43 #endif |
43 | 44 |
44 DISALLOW_COPY_AND_ASSIGN(LayoutTestBrowserMainParts); | 45 DISALLOW_COPY_AND_ASSIGN(LayoutTestBrowserMainParts); |
45 }; | 46 }; |
46 | 47 |
47 } // namespace content | 48 } // namespace content |
48 | 49 |
49 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ | 50 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_ |
OLD | NEW |