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

Unified Diff: extensions/browser/api/app_window/app_window_apitest.cc

Issue 2789413003: Make AppWindowCreateFunction UIThreadExtensionFunction. (Closed)
Patch Set: rename tests Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/api/app_window/app_window_api.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/app_window/app_window_apitest.cc
diff --git a/extensions/browser/api/app_window/app_window_apitest.cc b/extensions/browser/api/app_window/app_window_apitest.cc
index 2bc34b1b9c923fa81b7bf462948b6d00c7088a2b..fff0454a6c4defa6b71041e1aead3708305c590d 100644
--- a/extensions/browser/api/app_window/app_window_apitest.cc
+++ b/extensions/browser/api/app_window/app_window_apitest.cc
@@ -58,8 +58,11 @@ class TestAppWindowRegistryObserver : public AppWindowRegistry::Observer {
} // namespace
+using AppWindowApiTest = PlatformAppBrowserTest;
+using ExperimentalAppWindowApiTest = ExperimentalPlatformAppBrowserTest;
+
// Tests chrome.app.window.setIcon.
-IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest, WindowsApiSetIcon) {
+IN_PROC_BROWSER_TEST_F(ExperimentalAppWindowApiTest, SetIcon) {
std::unique_ptr<TestAppWindowRegistryObserver> test_observer(
new TestAppWindowRegistryObserver(browser()->profile()));
ExtensionTestMessageListener listener("ready", true);
@@ -90,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest, WindowsApiSetIcon) {
// Flaky on Mac, http://crbug.com/232330
#if defined(TOOLKIT_VIEWS) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, Properties) {
#if defined(OS_MACOSX)
if (base::mac::IsOS10_10())
return; // Fails when swarmed. http://crbug.com/660582
@@ -101,44 +104,40 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) {
#endif // defined(TOOLKIT_VIEWS)
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiAlwaysOnTopWithPermissions) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, AlwaysOnTopWithPermissions) {
EXPECT_TRUE(RunPlatformAppTest(
"platform_apps/windows_api_always_on_top/has_permissions")) << message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiAlwaysOnTopWithOldPermissions) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, AlwaysOnTopWithOldPermissions) {
EXPECT_TRUE(RunPlatformAppTest(
"platform_apps/windows_api_always_on_top/has_old_permissions"))
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiAlwaysOnTopNoPermissions) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, AlwaysOnTopNoPermissions) {
EXPECT_TRUE(RunPlatformAppTest(
"platform_apps/windows_api_always_on_top/no_permissions")) << message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, Get) {
EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get"))
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiSetShapeHasPerm) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, SetShapeHasPerm) {
EXPECT_TRUE(
RunPlatformAppTest("platform_apps/windows_api_shape/has_permission"))
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiSetShapeNoPerm) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, SetShapeNoPerm) {
EXPECT_TRUE(
RunPlatformAppTest("platform_apps/windows_api_shape/no_permission"))
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiAlphaEnabledHasPermissions) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, AlphaEnabledHasPermissions) {
const char kNoAlphaDir[] =
"platform_apps/windows_api_alpha_enabled/has_permissions_no_alpha";
const char kHasAlphaDir[] =
@@ -159,14 +158,13 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
EXPECT_TRUE(RunPlatformAppTest(test_dir)) << message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiAlphaEnabledNoPermissions) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, AlphaEnabledNoPermissions) {
EXPECT_TRUE(RunPlatformAppTest(
"platform_apps/windows_api_alpha_enabled/no_permissions"))
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiAlphaEnabledInStable) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, AlphaEnabledInStable) {
extensions::ScopedCurrentChannel channel(version_info::Channel::STABLE);
EXPECT_TRUE(RunPlatformAppTestWithFlags(
"platform_apps/windows_api_alpha_enabled/in_stable",
@@ -176,15 +174,13 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiAlphaEnabledInStable) {
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiAlphaEnabledWrongFrameType) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, AlphaEnabledWrongFrameType) {
EXPECT_TRUE(RunPlatformAppTest(
"platform_apps/windows_api_alpha_enabled/wrong_frame_type"))
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiVisibleOnAllWorkspacesInStable) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, VisibleOnAllWorkspacesInStable) {
extensions::ScopedCurrentChannel channel(version_info::Channel::STABLE);
EXPECT_TRUE(RunPlatformAppTest(
"platform_apps/windows_api_visible_on_all_workspaces/in_stable"))
@@ -192,8 +188,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
}
#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiImeWindowHasPermissions) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, ImeWindowHasPermissions) {
EXPECT_TRUE(RunComponentExtensionTest(
"platform_apps/windows_api_ime/has_permissions_whitelisted"))
<< message_;
@@ -204,8 +199,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiImeWindowNoPermissions) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, ImeWindowNoPermissions) {
EXPECT_TRUE(RunComponentExtensionTest(
"platform_apps/windows_api_ime/no_permissions_whitelisted"))
<< message_;
@@ -215,8 +209,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
- WindowsApiImeWindowNotFullscreen) {
+IN_PROC_BROWSER_TEST_F(AppWindowApiTest, ImeWindowNotFullscreen) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
command_line->AppendSwitch(switches::kForceAppMode);
command_line->AppendSwitchASCII(switches::kAppId,
« no previous file with comments | « extensions/browser/api/app_window/app_window_api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698