| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_function_test_utils.h" | 7 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| 8 #include "chrome/browser/extensions/test_extension_dir.h" | 8 #include "chrome/browser/extensions/test_extension_dir.h" |
| 9 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
| 10 #include "content/public/browser/notification_service.h" | 10 #include "content/public/browser/notification_service.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 extensions::ScopedTestDialogAutoConfirm auto_confirm( | 37 extensions::ScopedTestDialogAutoConfirm auto_confirm( |
| 38 extensions::ScopedTestDialogAutoConfirm::ACCEPT); | 38 extensions::ScopedTestDialogAutoConfirm::ACCEPT); |
| 39 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("runtime") | 39 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("runtime") |
| 40 .AppendASCII("uninstall_url") | 40 .AppendASCII("uninstall_url") |
| 41 .AppendASCII("sets_uninstall_url"))); | 41 .AppendASCII("sets_uninstall_url"))); |
| 42 ASSERT_TRUE(RunExtensionTest("runtime/uninstall_url")) << message_; | 42 ASSERT_TRUE(RunExtensionTest("runtime/uninstall_url")) << message_; |
| 43 } | 43 } |
| 44 | 44 |
| 45 namespace extensions { | 45 namespace extensions { |
| 46 | 46 |
| 47 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPage) { | 47 // Flaky: crbug.com/599213 |
| 48 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
| 49 DISABLED_ChromeRuntimeOpenOptionsPage) { |
| 48 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page")); | 50 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page")); |
| 49 } | 51 } |
| 50 | 52 |
| 51 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPageError) { | 53 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPageError) { |
| 52 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page_error")); | 54 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page_error")); |
| 53 } | 55 } |
| 54 | 56 |
| 55 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeGetPlatformInfo) { | 57 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeGetPlatformInfo) { |
| 56 scoped_ptr<base::Value> result( | 58 scoped_ptr<base::Value> result( |
| 57 extension_function_test_utils::RunFunctionAndReturnSingleResult( | 59 extension_function_test_utils::RunFunctionAndReturnSingleResult( |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 } else { | 124 } else { |
| 123 load_observer.Wait(); | 125 load_observer.Wait(); |
| 124 WaitForExtensionViewsToLoad(); | 126 WaitForExtensionViewsToLoad(); |
| 125 } | 127 } |
| 126 } | 128 } |
| 127 ASSERT_TRUE( | 129 ASSERT_TRUE( |
| 128 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); | 130 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); |
| 129 } | 131 } |
| 130 | 132 |
| 131 } // namespace extensions | 133 } // namespace extensions |
| OLD | NEW |