cros: Disable the auto management logic for v1app browser window

chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc

Index: chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
index 8dda539b698de57df801ec1cc5ba9782087a3db8..9226bf3eefd5088ce740251b76743034d9724b29 100644
--- a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
@@ -18,10 +18,7 @@
 #if defined(USE_AURA)
 #include "chrome/browser/ui/browser_window_state.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
 #endif
 
 using views::FocusManager;
@@ -86,15 +83,11 @@ IN_PROC_BROWSER_TEST_P(BrowserViewTestParam, BrowserRemembersDockedState) {
 
   // Create a new app browser
   Browser* browser = new Browser(params);
-  ASSERT_TRUE(browser);
   gfx::NativeWindow window = browser->window()->GetNativeWindow();
   gfx::Rect original_bounds(gfx::Rect(150, 250, 400, 100));
   window->SetBounds(original_bounds);
   window->Show();
   // Dock the browser window using |kShowStateKey| property.
-  gfx::Rect work_area = display::Screen::GetScreen()
-                            ->GetDisplayNearestPoint(window->bounds().origin())
-                            .work_area();
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_DOCKED);
 
   // Saved placement should reflect docked state (for app windows only in Ash).
@@ -109,58 +102,26 @@ IN_PROC_BROWSER_TEST_P(BrowserViewTestParam, BrowserRemembersDockedState) {
   if (!kIsAsh)
     return;
 
-  // Saved placement should reflect restore bounds.
-  ASSERT_NE(nullptr, window->GetProperty(aura::client::kRestoreBoundsKey));
-  original_bounds = *window->GetProperty(aura::client::kRestoreBoundsKey);
-  gfx::Rect expected_bounds = work_area;
-  expected_bounds.ClampToCenteredSize(original_bounds.size());
-  expected_bounds.set_y(original_bounds.y());
-  EXPECT_EQ(expected_bounds.ToString(), bounds.ToString());
-  EXPECT_EQ(expected_bounds.ToString(), original_bounds.ToString());
-
-  // Browser window should be docked.
-  int width = 250;  // same as DockedWindowLayoutManager::kIdealWidth.
-  if (window->delegate() && window->delegate()->GetMinimumSize().width() != 0)
-    width = std::max(width, window->delegate()->GetMinimumSize().width());
-  expected_bounds = work_area;
-  expected_bounds.set_width(width);
-  expected_bounds.set_x(work_area.right() - expected_bounds.width());
-  EXPECT_EQ(expected_bounds.ToString(), window->GetTargetBounds().ToString());
-  EXPECT_EQ(ui::SHOW_STATE_DOCKED,
-            window->GetProperty(aura::client::kShowStateKey));
-  browser->window()->Close();
-
   // Newly created browser with the same app name should retain docked state
   // for app browser window but leave it as normal for a tabbed browser.
   browser = new Browser(params);
-  ASSERT_TRUE(browser);
   browser->window()->Show();
   window = browser->window()->GetNativeWindow();
-  EXPECT_EQ(test_app ? expected_bounds.ToString() : original_bounds.ToString(),
-            window->GetTargetBounds().ToString());
   EXPECT_EQ(test_app ? ui::SHOW_STATE_DOCKED : ui::SHOW_STATE_NORMAL,
             window->GetProperty(aura::client::kShowStateKey));
 
-  // Undocking the browser window should restore original size and vertical
-  // offset while centering the window horizontally.
-  // Tabbed window is already not docked.
-  expected_bounds = work_area;
-  expected_bounds.ClampToCenteredSize(original_bounds.size());
-  expected_bounds.set_y(original_bounds.y());
+  // Undocking the browser window.
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
-  EXPECT_EQ(expected_bounds.ToString(), window->GetTargetBounds().ToString());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL,
             window->GetProperty(aura::client::kShowStateKey));
   browser->window()->Close();
 
   // Re-create the browser window with the same app name.
   browser = new Browser(params);
-  ASSERT_TRUE(browser);
   browser->window()->Show();
 
-  // Newly created browser should retain undocked state and bounds.
+  // Newly created browser should retain undocked state.
   window = browser->window()->GetNativeWindow();
-  EXPECT_EQ(expected_bounds.ToString(), window->GetTargetBounds().ToString());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL,
             window->GetProperty(aura::client::kShowStateKey));
 }