Chromium Code Reviews| 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/test/browser_test_utils.h" | 10 #include "content/public/test/browser_test_utils.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 | 91 |
| 92 private: | 92 private: |
| 93 base::ScopedTempDir scoped_temp_dir_; | 93 base::ScopedTempDir scoped_temp_dir_; |
| 94 ScopedIgnoreContentVerifierForTest ignore_content_verification_; | 94 ScopedIgnoreContentVerifierForTest ignore_content_verification_; |
| 95 | 95 |
| 96 DISALLOW_COPY_AND_ASSIGN(RuntimeAPIUpdateTest); | 96 DISALLOW_COPY_AND_ASSIGN(RuntimeAPIUpdateTest); |
| 97 }; | 97 }; |
| 98 | 98 |
| 99 } // namespace | 99 } // namespace |
| 100 | 100 |
| 101 #if defined(OS_CHROMEOS) | |
|
Devlin
2017/06/09 14:56:34
Why? This refers to the extensions options page,
Dan Beam
2017/06/09 19:23:29
yeah, sorry. leftovers from when opening the uber
| |
| 101 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPage) { | 102 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPage) { |
| 102 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page")); | 103 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page")); |
| 103 } | 104 } |
| 105 #endif | |
| 104 | 106 |
| 105 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPageError) { | 107 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPageError) { |
| 106 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page_error")); | 108 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page_error")); |
| 107 } | 109 } |
| 108 | 110 |
| 109 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeGetPlatformInfo) { | 111 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeGetPlatformInfo) { |
| 110 std::unique_ptr<base::Value> result( | 112 std::unique_ptr<base::Value> result( |
| 111 extension_function_test_utils::RunFunctionAndReturnSingleResult( | 113 extension_function_test_utils::RunFunctionAndReturnSingleResult( |
| 112 new RuntimeGetPlatformInfoFunction(), "[]", browser())); | 114 new RuntimeGetPlatformInfoFunction(), "[]", browser())); |
| 113 ASSERT_TRUE(result.get() != NULL); | 115 ASSERT_TRUE(result.get() != NULL); |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 209 ResultCatcher catcher; | 211 ResultCatcher catcher; |
| 210 const int expected_change = 1; | 212 const int expected_change = 1; |
| 211 const Extension* extension_v2 = | 213 const Extension* extension_v2 = |
| 212 UpdateExtension(extension_id, data[1].crx_path, expected_change); | 214 UpdateExtension(extension_id, data[1].crx_path, expected_change); |
| 213 ASSERT_TRUE(extension_v2); | 215 ASSERT_TRUE(extension_v2); |
| 214 EXPECT_TRUE(catcher.GetNextResult()); | 216 EXPECT_TRUE(catcher.GetNextResult()); |
| 215 } | 217 } |
| 216 } | 218 } |
| 217 | 219 |
| 218 } // namespace extensions | 220 } // namespace extensions |
| OLD | NEW |