| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ | 5 #ifndef CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ |
| 6 #define CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ | 6 #define CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include <memory> |
| 9 |
| 9 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| 10 #include "content/public/test/browser_test.h" | 11 #include "content/public/test/browser_test.h" |
| 11 #include "content/public/test/browser_test_base.h" | 12 #include "content/public/test/browser_test_base.h" |
| 12 | 13 |
| 13 namespace content { | 14 namespace content { |
| 14 class Shell; | 15 class Shell; |
| 15 class ShellMainDelegate; | 16 class ShellMainDelegate; |
| 16 | 17 |
| 17 // Base class for browser tests which use content_shell. | 18 // Base class for browser tests which use content_shell. |
| 18 class ContentBrowserTest : public BrowserTestBase { | 19 class ContentBrowserTest : public BrowserTestBase { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 36 | 37 |
| 37 // Returns the window for the test. | 38 // Returns the window for the test. |
| 38 Shell* shell() const { return shell_; } | 39 Shell* shell() const { return shell_; } |
| 39 | 40 |
| 40 private: | 41 private: |
| 41 Shell* shell_; | 42 Shell* shell_; |
| 42 | 43 |
| 43 #if defined(OS_ANDROID) | 44 #if defined(OS_ANDROID) |
| 44 // For all other platforms, this is done automatically when calling into | 45 // For all other platforms, this is done automatically when calling into |
| 45 // ContentMain. For Android we set things up manually. | 46 // ContentMain. For Android we set things up manually. |
| 46 scoped_ptr<ShellMainDelegate> shell_main_delegate_; | 47 std::unique_ptr<ShellMainDelegate> shell_main_delegate_; |
| 47 #endif | 48 #endif |
| 48 }; | 49 }; |
| 49 | 50 |
| 50 } // namespace content | 51 } // namespace content |
| 51 | 52 |
| 52 #endif // CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ | 53 #endif // CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ |
| OLD | NEW |