Make AppWindowCreateFunction UIThreadExtensionFunction.

extensions/browser/api/app_window/app_window_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
@@ skipping 40 matching lines @@
 
  private:
   Profile* profile_;
   int icon_updates_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver);
 };
 
 }  // 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);
 
   // Launch the app and wait for it to be ready.
   LoadAndLaunchPlatformApp("windows_api_set_icon", &listener);
   EXPECT_EQ(0, test_observer->icon_updates());
   listener.Reply("");
 
   // Now wait until the WebContent has decoded the icon and chrome has
@@ skipping 10 matching lines @@
   EXPECT_EQ(1, test_observer->icon_updates());
 }
 
 // TODO(asargent) - Figure out what to do about the fact that minimize events
 // don't work under ubuntu unity.
 // (crbug.com/162794 and https://bugs.launchpad.net/unity/+bug/998073).
 // TODO(linux_aura) http://crbug.com/163931
 // 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
 #endif
   EXPECT_TRUE(
       RunExtensionTest("platform_apps/windows_api_properties")) << message_;
 }
 
 #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[] =
       "platform_apps/windows_api_alpha_enabled/has_permissions_has_alpha";
   ALLOW_UNUSED_LOCAL(kHasAlphaDir);
   const char* test_dir = kNoAlphaDir;
 
 #if defined(USE_AURA) && (defined(OS_CHROMEOS) || !defined(OS_LINUX))
   test_dir = kHasAlphaDir;
 
 #if defined(OS_WIN)
   if (!ui::win::IsAeroGlassEnabled()) {
     test_dir = kNoAlphaDir;
   }
 #endif  // OS_WIN
 #endif  // USE_AURA && (OS_CHROMEOS || !OS_LINUX)
 
   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",
       // Ignore manifest warnings because the extension will not load at all
       // in stable.
       kFlagIgnoreManifestWarnings))
       << 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"))
       << message_;
 }
 
 #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_;
 
   EXPECT_TRUE(RunPlatformAppTestWithFlags(
       "platform_apps/windows_api_ime/has_permissions_platform_app",
       kFlagIgnoreManifestWarnings))
       << 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_;
 
   EXPECT_TRUE(RunPlatformAppTest(
       "platform_apps/windows_api_ime/no_permissions_platform_app"))
       << 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,
                                   "jkghodnilhceideoidjikpgommlajknk");
 
   EXPECT_TRUE(RunComponentExtensionTest(
       "platform_apps/windows_api_ime/forced_app_mode_not_fullscreen"))
       << message_;
 }
 #endif  // OS_CHROMEOS
 
 }  // namespace extensions