| 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 #include "base/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/browser_navigator.h" | 12 #include "chrome/browser/ui/browser_navigator_params.h" |
| 13 #include "chrome/browser/ui/extensions/app_launch_params.h" | 13 #include "chrome/browser/ui/extensions/app_launch_params.h" |
| 14 #include "chrome/browser/ui/extensions/application_launch.h" | 14 #include "chrome/browser/ui/extensions/application_launch.h" |
| 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 16 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
| 17 #include "chrome/test/base/ui_test_utils.h" | 17 #include "chrome/test/base/ui_test_utils.h" |
| 18 #include "chrome/test/nacl/nacl_browsertest_util.h" | 18 #include "chrome/test/nacl/nacl_browsertest_util.h" |
| 19 #include "chrome/test/ppapi/ppapi_test.h" | 19 #include "chrome/test/ppapi/ppapi_test.h" |
| 20 #include "components/content_settings/core/browser/host_content_settings_map.h" | 20 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 21 #include "components/nacl/common/nacl_switches.h" | 21 #include "components/nacl/common/nacl_switches.h" |
| 22 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
| (...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1226 extensions::SOURCE_TEST); | 1226 extensions::SOURCE_TEST); |
| 1227 params.command_line = *base::CommandLine::ForCurrentProcess(); | 1227 params.command_line = *base::CommandLine::ForCurrentProcess(); |
| 1228 OpenApplication(params); | 1228 OpenApplication(params); |
| 1229 } | 1229 } |
| 1230 | 1230 |
| 1231 void RunTests(const std::string& extension_dirname) { | 1231 void RunTests(const std::string& extension_dirname) { |
| 1232 ExtensionTestMessageListener listener("PASS", true); | 1232 ExtensionTestMessageListener listener("PASS", true); |
| 1233 LaunchTestingApp(extension_dirname); | 1233 LaunchTestingApp(extension_dirname); |
| 1234 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 1234 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
| 1235 } | 1235 } |
| 1236 |
| 1236 protected: | 1237 protected: |
| 1237 std::string toolchain_; | 1238 std::string toolchain_; |
| 1238 }; | 1239 }; |
| 1239 | 1240 |
| 1240 class NewlibPackagedAppTest : public PackagedAppTest { | 1241 class NewlibPackagedAppTest : public PackagedAppTest { |
| 1241 public: | 1242 public: |
| 1242 NewlibPackagedAppTest() : PackagedAppTest("newlib") { } | 1243 NewlibPackagedAppTest() : PackagedAppTest("newlib") { } |
| 1243 }; | 1244 }; |
| 1244 | 1245 |
| 1245 class NonSfiPackagedAppTest : public PackagedAppTest { | 1246 class NonSfiPackagedAppTest : public PackagedAppTest { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 1273 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1274 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
| 1274 RunTests("no_socket_permissions"); | 1275 RunTests("no_socket_permissions"); |
| 1275 } | 1276 } |
| 1276 | 1277 |
| 1277 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1278 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1278 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1279 MAYBE_PPAPI_NACL(SocketPermissions)) { |
| 1279 RunTests("socket_permissions"); | 1280 RunTests("socket_permissions"); |
| 1280 } | 1281 } |
| 1281 | 1282 |
| 1282 #endif | 1283 #endif |
| OLD | NEW |