Revert 190584 "Alternate NTP Mac: Show overlay at fixed position"

trunk/src/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
 class DevToolsControllerTest : public InProcessBrowserTest {
  public:
   DevToolsControllerTest() : InProcessBrowserTest() {
   }
 
@@ skipping 44 matching lines @@
 
 // When docked to the right the dev tools view should be shrunk so that it
 // doesn't overlap the bookmark bar.
 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, ViewSize) {
   EXPECT_EQ(2u, [[[controller() splitView] subviews] count]);
   NSView* container_view = [[[controller() splitView] subviews] lastObject];
   EXPECT_EQ(1u, [[container_view subviews] count]);
   NSView* dev_tools_view = [[container_view subviews] lastObject];
   CGFloat width = NSWidth([[controller() splitView] bounds]);
   CGFloat height = NSHeight([[controller() splitView] bounds]);
-  CGFloat offset = [controller() topContentOffset];
+
+  SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
+  EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
+
+  SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
+  EXPECT_EQ(height, NSHeight([dev_tools_view bounds]));
+
+  CGFloat offset = 50;
+  [controller() setTopContentOffset:offset];
 
   SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
   EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
 
   SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
   EXPECT_EQ(height - offset, NSHeight([dev_tools_view bounds]));
-
-  CGFloat new_offset = 50;
-  [controller() setTopContentOffset:new_offset];
-
-  SetDockSide(DEVTOOLS_DOCK_SIDE_BOTTOM);
-  EXPECT_EQ(width, NSWidth([dev_tools_view bounds]));
-
-  SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
-  EXPECT_EQ(height - new_offset, NSHeight([dev_tools_view bounds]));
 }
 
 // Verify that the dev tool's web view is layed out correctly when docked to the
 // right.
 IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, WebViewLayout) {
   CGFloat offset = 50;
   [controller() setTopContentOffset:offset];
 
   SetDockSide(DEVTOOLS_DOCK_SIDE_RIGHT);
   AddTabAtIndex(0,
                 GURL(chrome::kAboutBlankURL),
                 content::PAGE_TRANSITION_TYPED);
   DevToolsWindow::ToggleDevToolsWindow(browser(), DEVTOOLS_TOGGLE_ACTION_SHOW);
 
   NSView* container_view = [[[controller() splitView] subviews] lastObject];
   NSView* dev_tools_view = [[container_view subviews] lastObject];
   NSView* web_view = [[dev_tools_view subviews] lastObject];
 
   CGFloat height = NSHeight([[controller() splitView] bounds]);
 
   EXPECT_EQ(height - offset, NSHeight([web_view bounds]));
   EXPECT_EQ(0, NSMinY([web_view bounds]));
 
   // Update the offset and verify that the view is resized.
   CGFloat new_offset = 25;
   [controller() setTopContentOffset:new_offset];
   EXPECT_EQ(height - new_offset, NSHeight([web_view bounds]));
   EXPECT_EQ(0, NSMinY([web_view bounds]));
 }
-
-// Verify that the dev tools undocked window is layed out correctly.
-IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, UndockedOffset) {
-  BrowserList* browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
-  EXPECT_EQ(1u, browser_list->size());
-  SetDockSide(DEVTOOLS_DOCK_SIDE_UNDOCKED);
-  EXPECT_EQ(2u, browser_list->size());
-
-  Browser* dev_tools_browser = browser_list->get(1);
-  BrowserWindowController* window_controller =
-      [BrowserWindowController browserWindowControllerForWindow:
-              dev_tools_browser->window()->GetNativeWindow()];
-  EXPECT_EQ(0.0, [[window_controller devToolsController] topContentOffset]);
-}