| 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/run_loop.h" | 5 #include "base/run_loop.h" |
| 6 #include "base/strings/string_number_conversions.h" | 6 #include "base/strings/string_number_conversions.h" |
| 7 #include "chrome/browser/apps/app_browsertest_util.h" | 7 #include "chrome/browser/apps/app_browsertest_util.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
| 10 #include "chrome/common/extensions/features/feature_channel.h" | 10 #include "chrome/common/extensions/features/feature_channel.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 } | 145 } |
| 146 | 146 |
| 147 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | 147 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, |
| 148 WindowsApiAlphaEnabledNoPermissions) { | 148 WindowsApiAlphaEnabledNoPermissions) { |
| 149 EXPECT_TRUE(RunPlatformAppTest( | 149 EXPECT_TRUE(RunPlatformAppTest( |
| 150 "platform_apps/windows_api_alpha_enabled/no_permissions")) | 150 "platform_apps/windows_api_alpha_enabled/no_permissions")) |
| 151 << message_; | 151 << message_; |
| 152 } | 152 } |
| 153 | 153 |
| 154 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiAlphaEnabledInStable) { | 154 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiAlphaEnabledInStable) { |
| 155 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); | 155 extensions::ScopedCurrentChannel channel(version_info::Channel::STABLE); |
| 156 EXPECT_TRUE(RunPlatformAppTestWithFlags( | 156 EXPECT_TRUE(RunPlatformAppTestWithFlags( |
| 157 "platform_apps/windows_api_alpha_enabled/in_stable", | 157 "platform_apps/windows_api_alpha_enabled/in_stable", |
| 158 // Ignore manifest warnings because the extension will not load at all | 158 // Ignore manifest warnings because the extension will not load at all |
| 159 // in stable. | 159 // in stable. |
| 160 kFlagIgnoreManifestWarnings)) | 160 kFlagIgnoreManifestWarnings)) |
| 161 << message_; | 161 << message_; |
| 162 } | 162 } |
| 163 | 163 |
| 164 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | 164 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, |
| 165 WindowsApiAlphaEnabledWrongFrameType) { | 165 WindowsApiAlphaEnabledWrongFrameType) { |
| 166 EXPECT_TRUE(RunPlatformAppTest( | 166 EXPECT_TRUE(RunPlatformAppTest( |
| 167 "platform_apps/windows_api_alpha_enabled/wrong_frame_type")) | 167 "platform_apps/windows_api_alpha_enabled/wrong_frame_type")) |
| 168 << message_; | 168 << message_; |
| 169 } | 169 } |
| 170 | 170 |
| 171 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | 171 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, |
| 172 WindowsApiVisibleOnAllWorkspacesInStable) { | 172 WindowsApiVisibleOnAllWorkspacesInStable) { |
| 173 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); | 173 extensions::ScopedCurrentChannel channel(version_info::Channel::STABLE); |
| 174 EXPECT_TRUE(RunPlatformAppTest( | 174 EXPECT_TRUE(RunPlatformAppTest( |
| 175 "platform_apps/windows_api_visible_on_all_workspaces/in_stable")) | 175 "platform_apps/windows_api_visible_on_all_workspaces/in_stable")) |
| 176 << message_; | 176 << message_; |
| 177 } | 177 } |
| 178 | 178 |
| 179 #if defined(OS_CHROMEOS) | 179 #if defined(OS_CHROMEOS) |
| 180 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | 180 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, |
| 181 WindowsApiImeWindowHasPermissions) { | 181 WindowsApiImeWindowHasPermissions) { |
| 182 EXPECT_TRUE(RunComponentExtensionTest( | 182 EXPECT_TRUE(RunComponentExtensionTest( |
| 183 "platform_apps/windows_api_ime/has_permissions_whitelisted")) | 183 "platform_apps/windows_api_ime/has_permissions_whitelisted")) |
| (...skipping 23 matching lines...) Expand all Loading... |
| 207 command_line->AppendSwitchASCII(switches::kAppId, | 207 command_line->AppendSwitchASCII(switches::kAppId, |
| 208 "jkghodnilhceideoidjikpgommlajknk"); | 208 "jkghodnilhceideoidjikpgommlajknk"); |
| 209 | 209 |
| 210 EXPECT_TRUE(RunComponentExtensionTest( | 210 EXPECT_TRUE(RunComponentExtensionTest( |
| 211 "platform_apps/windows_api_ime/forced_app_mode_not_fullscreen")) | 211 "platform_apps/windows_api_ime/forced_app_mode_not_fullscreen")) |
| 212 << message_; | 212 << message_; |
| 213 } | 213 } |
| 214 #endif // OS_CHROMEOS | 214 #endif // OS_CHROMEOS |
| 215 | 215 |
| 216 } // namespace extensions | 216 } // namespace extensions |
| OLD | NEW |