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 "base/memory/scoped_ptr.h" |
9 #include "content/public/test/browser_test.h" | 9 #include "content/public/test/browser_test.h" |
10 #include "content/public/test/browser_test_base.h" | 10 #include "content/public/test/browser_test_base.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 | 32 |
33 // Creates an off-the-record window and loads about:blank. | 33 // Creates an off-the-record window and loads about:blank. |
34 Shell* CreateOffTheRecordBrowser(); | 34 Shell* CreateOffTheRecordBrowser(); |
35 | 35 |
36 // Returns the window for the test. | 36 // Returns the window for the test. |
37 Shell* shell() const { return shell_; } | 37 Shell* shell() const { return shell_; } |
38 | 38 |
39 private: | 39 private: |
40 Shell* shell_; | 40 Shell* shell_; |
41 | 41 |
42 bool setup_called_; | |
43 | |
44 #if defined(OS_ANDROID) | 42 #if defined(OS_ANDROID) |
45 // For all other platforms, this is done automatically when calling into | 43 // For all other platforms, this is done automatically when calling into |
46 // ContentMain. For Android we set things up manually. | 44 // ContentMain. For Android we set things up manually. |
47 scoped_ptr<ShellMainDelegate> shell_main_delegate_; | 45 scoped_ptr<ShellMainDelegate> shell_main_delegate_; |
48 #endif | 46 #endif |
49 }; | 47 }; |
50 | 48 |
51 } // namespace content | 49 } // namespace content |
52 | 50 |
53 #endif // CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ | 51 #endif // CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ |
OLD | NEW |