Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(417)

Side by Side Diff: extensions/browser/api/runtime/runtime_apitest.cc

Issue 1850593002: Enable ExtensionApiTest.ChromeRuntimeOpenOptionsPage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/test/data/extensions/api_test/runtime/open_options_page/test.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 // Flaky: crbug.com/599213 47 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPage) {
48 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
49 DISABLED_ChromeRuntimeOpenOptionsPage) {
50 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page")); 48 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page"));
51 } 49 }
52 50
53 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPageError) { 51 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeOpenOptionsPageError) {
54 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page_error")); 52 ASSERT_TRUE(RunExtensionTest("runtime/open_options_page_error"));
55 } 53 }
56 54
57 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeGetPlatformInfo) { 55 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeGetPlatformInfo) {
58 scoped_ptr<base::Value> result( 56 scoped_ptr<base::Value> result(
59 extension_function_test_utils::RunFunctionAndReturnSingleResult( 57 extension_function_test_utils::RunFunctionAndReturnSingleResult(
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } else { 122 } else {
125 load_observer.Wait(); 123 load_observer.Wait();
126 WaitForExtensionViewsToLoad(); 124 WaitForExtensionViewsToLoad();
127 } 125 }
128 } 126 }
129 ASSERT_TRUE( 127 ASSERT_TRUE(
130 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); 128 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED));
131 } 129 }
132 130
133 } // namespace extensions 131 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/api_test/runtime/open_options_page/test.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698