Disable modal JavaScript dialogs for platform apps.

chrome/browser/extensions/platform_app_browsertest.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/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 19 matching lines @@
   // RenderViewContextMenu.
   virtual bool GetAcceleratorForCommandId(int command_id,
                                           ui::Accelerator* accelerator) {
     return false;
   }
   virtual void PlatformInit() {}
 };
 
 }  // namespace
 
-class PlatformAppBrowserTest : public ExtensionBrowserTest {
+class PlatformAppBrowserTest : public ExtensionApiTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePlatformApps);
   }
 
  protected:
   void LoadAndLaunchPlatformApp(const char* name) {
     ui_test_utils::WindowedNotificationObserver app_loaded_observer(
         content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
@@ skipping 118 matching lines @@
   ASSERT_EQ(1, menu->menu_model().GetItemCount());
 }
 
 // Disabled until shell windows are implemented for non-GTK, non-Views toolkits.
 #if defined(TOOLKIT_GTK) || defined(TOOLKIT_VIEWS)
 #define MAYBE_DisallowNavigation DisallowNavigation
 #else
 #define MAYBE_DisallowNavigation DISABLED_DisallowNavigation
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_DisallowNavigation) {
-   ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(test_server()->Start());
 
   LoadAndLaunchPlatformApp("navigation");
   WebContents* web_contents = GetFirstPlatformAppWebContents();
 
   GURL remote_url = test_server()->GetURL(
       "files/extensions/platform_apps/navigation/nav-target.html");
 
   std::string script = StringPrintf(
       "runTests(\"%s\")", remote_url.spec().c_str());
   bool result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       web_contents->GetRenderViewHost(), L"",
       UTF8ToWide(script), &result));
   EXPECT_TRUE(result);
 }
+
+// Disabled until shell windows are implemented for non-GTK, non-Views toolkits.
+#if defined(TOOLKIT_GTK) || defined(TOOLKIT_VIEWS)
+#define MAYBE_DisallowModalDialogs DisallowModalDialogs
+#else
+#define MAYBE_DisallowModalDialogs DISABLED_DisallowModalDialogs
+#endif
+IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_DisallowModalDialogs) {
+  ASSERT_TRUE(RunExtensionTest("platform_apps/modal_dialogs")) << message_;

[jstritar, 2012/01/19 20:20:41]

I'll convert these to use RunExtensionSubtest and the same app, once one of the
CLs lands.

+}