Cleanup to keep panel from manipulating its panel strip assignment directly.

chrome/browser/ui/panels/detached_panel_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 "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/detached_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 
 class DetachedPanelBrowserTest : public BasePanelBrowserTest {
 };
 
-IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest,
-                       DISABLED_CheckDetachedPanelProperties) {
+IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CheckDetachedPanelProperties) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create 2 panels.
   Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 250, 200));
   Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 300, 200));
 
   EXPECT_TRUE(panel1->draggable());
   EXPECT_TRUE(panel2->draggable());
 
   // Move panels to detached strip.
   EXPECT_EQ(2, panel_manager->num_panels());
   EXPECT_EQ(0, detached_strip->num_panels());
-  panel1->MoveToStrip(detached_strip);
-  panel2->MoveToStrip(detached_strip);
+  panel_manager->MovePanelToStrip(panel1, PanelStrip::DETACHED);
+  panel_manager->MovePanelToStrip(panel2, PanelStrip::DETACHED);
   EXPECT_EQ(2, panel_manager->num_panels());
   EXPECT_EQ(2, detached_strip->num_panels());
 
-  std::vector<Panel*> panels = panel_manager->panels();
-  EXPECT_EQ(panel1, panels[0]);
-  EXPECT_EQ(panel2, panels[1]);
+  EXPECT_TRUE(detached_strip->HasPanel(panel1));
+  EXPECT_TRUE(detached_strip->HasPanel(panel2));
 
   EXPECT_TRUE(panel1->draggable());
   EXPECT_TRUE(panel2->draggable());
 
   panel_manager->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DragDetachedPanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
-  DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create one detached panel.
   Panel* panel = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 250, 200));
-  panel->MoveToStrip(detached_strip);
+  panel_manager->MovePanelToStrip(panel, PanelStrip::DETACHED);
 
   // Test that the detached panel can be dragged anywhere.
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
   gfx::Point origin = panel->GetBounds().origin();
 
   panel_testing->PressLeftMouseButtonTitlebar(origin);
   EXPECT_EQ(origin, panel->GetBounds().origin());
 
   panel_testing->DragTitlebar(-51, 102);
@@ skipping 32 matching lines @@
 IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CloseDetachedPanelOnDrag) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   PanelDragController* drag_controller = panel_manager->drag_controller();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create 4 detached panels.
   Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 100, 100));
   Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 110, 110));
   Panel* panel3 = CreatePanelWithBounds("Panel3", gfx::Rect(0, 0, 120, 120));
   Panel* panel4 = CreatePanelWithBounds("Panel4", gfx::Rect(0, 0, 130, 130));
-  panel1->MoveToStrip(detached_strip);
-  panel2->MoveToStrip(detached_strip);
-  panel3->MoveToStrip(detached_strip);
-  panel4->MoveToStrip(detached_strip);
+  panel_manager->MovePanelToStrip(panel1, PanelStrip::DETACHED);
+  panel_manager->MovePanelToStrip(panel2, PanelStrip::DETACHED);
+  panel_manager->MovePanelToStrip(panel3, PanelStrip::DETACHED);
+  panel_manager->MovePanelToStrip(panel4, PanelStrip::DETACHED);
   ASSERT_EQ(4, detached_strip->num_panels());
 
   scoped_ptr<NativePanelTesting> panel1_testing(
       NativePanelTesting::Create(panel1->native_panel()));
   gfx::Point panel1_old_position = panel1->GetBounds().origin();
   gfx::Point panel2_position = panel2->GetBounds().origin();
   gfx::Point panel3_position = panel3->GetBounds().origin();
   gfx::Point panel4_position = panel4->GetBounds().origin();
 
   // Test the scenario: drag a panel, close another panel, cancel the drag.
@@ skipping 107 matching lines @@
     CloseWindowAndWait(panel1->browser());
     EXPECT_FALSE(drag_controller->IsDragging());
 
     ASSERT_EQ(1, detached_strip->num_panels());
     EXPECT_TRUE(detached_strip->HasPanel(panel4));
     EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
   }
 
   panel_manager->CloseAll();
 }