Revert issue 158379 (chrome.window.create height)

chrome/browser/extensions/window_open_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/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 384 matching lines @@
   // Expect one panel (opened by extension) and one tab (from the panel calling
   // window.open). Panels modify the WindowOpenDisposition in window.open
   // to always open in a tab.
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), 1, 0, 1));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpener) {
   ASSERT_TRUE(RunExtensionTest("window_open/opener")) << message_;
 }
 
+#if defined(OS_MACOSX)
+// Extension popup windows are incorrectly sized on OSX, crbug.com/225601
+#define MAYBE_WindowOpenSized DISABLED_WindowOpenSized
+#else
+#define MAYBE_WindowOpenSized WindowOpenSized
+#endif
+// Ensure that the width and height properties of a window opened with
+// chrome.windows.create match the creation parameters. See crbug.com/173831.
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WindowOpenSized) {
+  ASSERT_TRUE(RunExtensionTest("window_open/window_size")) << message_;
+  EXPECT_TRUE(WaitForTabsAndPopups(browser(), 0, 1, 0));
+}
+
 // Tests that an extension page can call window.open to an extension URL and
 // the new window has extension privileges.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
 
   GURL start_url(std::string("chrome-extension://") +
       last_loaded_extension_id_ + "/test.html");
   ui_test_utils::NavigateToURL(browser(), start_url);
   WebContents* newtab = NULL;
@@ skipping 38 matching lines @@
       OpenWindow(browser()->tab_strip_model()->GetActiveWebContents(),
       GURL(std::string("chrome-extension://") + last_loaded_extension_id_ +
           "/newtab.html"), false, &newtab));
 
   // Extension API should succeed.
   bool result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()",
                                                    &result));
   EXPECT_TRUE(result);
 }