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

chrome/browser/ui/panels/panel_overflow_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 <vector>
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/overflow_panel_strip.h"
@@ skipping 236 matching lines @@
   EXPECT_FALSE(panel4->has_temporary_layout());
   EXPECT_FALSE(panel4->draggable());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, UpdateDraggableStatus) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreatePanel("panel");
   EXPECT_TRUE(panel->draggable());
-  panel->MoveToStrip(panel_manager->overflow_strip());
+  panel_manager->ChangePanelLayout(panel, PanelStrip::IN_OVERFLOW);
   EXPECT_FALSE(panel->draggable());
-  panel->MoveToStrip(panel_manager->docked_strip());
+  panel_manager->ChangePanelLayout(panel, PanelStrip::DOCKED);
   EXPECT_TRUE(panel->draggable());
   panel->Close();
 }
 
 // http://crbug.com/115619
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #define MAYBE_CreateOverflowPanels CreateOverflowPanels
 #else
 #define MAYBE_CreateOverflowPanels DISABLED_CreateOverflowPanels
 #endif
@@ skipping 372 matching lines @@
   EXPECT_EQ(2, docked_strip->num_panels());
   EXPECT_EQ(1, docked_strip->num_temporary_layout_panels());
   EXPECT_TRUE(overflow_panel->has_temporary_layout());
 
   // Close one of the non-overflow panels. Expect the delayed overflow
   // panel will not be affected by the close.
   // Hack. Pretend to close panel by removing it directly. Cannot use
   // CloseWindowAndWait() here because it will allow the delayed overflow
   // to complete.
   docked_strip->RemovePanel(panel1);
+  panel1->SetPanelStrip(NULL);

[Andrei, 2012/03/01 00:08:50]

That would nto be needed if RemovePanel() set it to NULL automatically.

[jennb, 2012/03/01 00:30:58]

Agree. This is the test that led me to try setting NULL in RemovePanel(). I
opted to add this one line rather than adding guards against NULL everywhere
that panel strip is accessed from the panel.

   EXPECT_EQ(1, docked_strip->num_panels());
   EXPECT_EQ(1, docked_strip->num_temporary_layout_panels());
   EXPECT_TRUE(overflow_panel->has_temporary_layout());
 
   // Make sure the overflow panel actually moves to overflow.
   WaitForLayoutModeChanged(overflow_panel, PanelStrip::IN_OVERFLOW);
   EXPECT_EQ(0, docked_strip->num_temporary_layout_panels());
 
   // Hack. Put the "falsely closed" panel back into the panel strip
   // so we can properly close it to wrap up this test.
@@ skipping 988 matching lines @@
   // End full screen mode, expansion occurs again.
   overflow_strip->OnFullScreenModeChanged(false);
   EXPECT_TRUE(panel_manager->mouse_watcher()->IsActive());
   MoveMouse(in_overflow_area);
   EXPECT_GT(overflow_strip->current_display_width(), iconified_width);
   MoveMouse(beyond_overflow_area);
   EXPECT_EQ(iconified_width, overflow_strip->current_display_width());
 
   panel_manager->CloseAll();
 }