| 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 CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ | 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ |
| 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ | 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 std::string message_; | 164 std::string message_; |
| 165 | 165 |
| 166 private: | 166 private: |
| 167 bool RunExtensionTestImpl(const std::string& extension_name, | 167 bool RunExtensionTestImpl(const std::string& extension_name, |
| 168 const std::string& test_page, | 168 const std::string& test_page, |
| 169 const char* custom_arg, | 169 const char* custom_arg, |
| 170 int flags); | 170 int flags); |
| 171 | 171 |
| 172 // Hold details of the test, set in C++, which can be accessed by | 172 // Hold details of the test, set in C++, which can be accessed by |
| 173 // javascript using chrome.test.getConfig(). | 173 // javascript using chrome.test.getConfig(). |
| 174 scoped_ptr<base::DictionaryValue> test_config_; | 174 std::unique_ptr<base::DictionaryValue> test_config_; |
| 175 | 175 |
| 176 // Hold the test WebSocket server. | 176 // Hold the test WebSocket server. |
| 177 scoped_ptr<net::SpawnedTestServer> websocket_server_; | 177 std::unique_ptr<net::SpawnedTestServer> websocket_server_; |
| 178 | 178 |
| 179 // Hold the test FTP server. | 179 // Hold the test FTP server. |
| 180 scoped_ptr<net::SpawnedTestServer> ftp_server_; | 180 std::unique_ptr<net::SpawnedTestServer> ftp_server_; |
| 181 }; | 181 }; |
| 182 | 182 |
| 183 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ | 183 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ |
| OLD | NEW |