| 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/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1476 .AppendASCII("tests") | 1476 .AppendASCII("tests") |
| 1477 .AppendASCII("extensions") | 1477 .AppendASCII("extensions") |
| 1478 .AppendASCII("packaged_app") | 1478 .AppendASCII("packaged_app") |
| 1479 .AppendASCII(toolchain_); | 1479 .AppendASCII(toolchain_); |
| 1480 | 1480 |
| 1481 const extensions::Extension* extension = LoadExtension(app_dir); | 1481 const extensions::Extension* extension = LoadExtension(app_dir); |
| 1482 ASSERT_TRUE(extension); | 1482 ASSERT_TRUE(extension); |
| 1483 | 1483 |
| 1484 AppLaunchParams params(browser()->profile(), extension, | 1484 AppLaunchParams params(browser()->profile(), extension, |
| 1485 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, | 1485 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, |
| 1486 extensions::SOURCE_UNTRACKED); | 1486 extensions::SOURCE_TEST); |
| 1487 params.command_line = *CommandLine::ForCurrentProcess(); | 1487 params.command_line = *CommandLine::ForCurrentProcess(); |
| 1488 OpenApplication(params); | 1488 OpenApplication(params); |
| 1489 } | 1489 } |
| 1490 | 1490 |
| 1491 void RunTests() { | 1491 void RunTests() { |
| 1492 ExtensionTestMessageListener listener("hello", true); | 1492 ExtensionTestMessageListener listener("hello", true); |
| 1493 LaunchTestingApp(); | 1493 LaunchTestingApp(); |
| 1494 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 1494 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
| 1495 } | 1495 } |
| 1496 protected: | 1496 protected: |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1535 | 1535 |
| 1536 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, | 1536 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, |
| 1537 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { | 1537 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { |
| 1538 RunTests(); | 1538 RunTests(); |
| 1539 } | 1539 } |
| 1540 | 1540 |
| 1541 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, | 1541 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, |
| 1542 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { | 1542 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { |
| 1543 RunTests(); | 1543 RunTests(); |
| 1544 } | 1544 } |
| OLD | NEW |