Revert 132144 - Broke ASAN

chrome/browser/ui/panels/base_panel_browser_test.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/browser_list.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 71 matching lines @@
   MockDesktopBar mock_desktop_bars[3];
 
   DISALLOW_COPY_AND_ASSIGN(MockDisplaySettingsProviderImpl);
 };
 
 
 MockDisplaySettingsProviderImpl::MockDisplaySettingsProviderImpl(
     PanelManager* panel_manager) {
   DisplaySettingsProvider* old_provider =
       panel_manager->display_settings_provider();
-
-  ObserverListBase<DisplaySettingsProvider::DisplayAreaObserver>::Iterator
-      display_area_observers_iter(old_provider->display_area_observers());
-  AddDisplayAreaObserver(display_area_observers_iter.GetNext());
-  DCHECK(!display_area_observers_iter.GetNext());
-
-  ObserverListBase<DisplaySettingsProvider::DesktopBarObserver>::Iterator
-      desktop_bar_observer_iter(old_provider->desktop_bar_observers());
-  AddDesktopBarObserver(desktop_bar_observer_iter.GetNext());
-  DCHECK(!desktop_bar_observer_iter.GetNext());
-
-  ObserverListBase<DisplaySettingsProvider::FullScreenObserver>::Iterator
-      full_screen_observer_iter(old_provider->full_screen_observers());
-  AddFullScreenObserver(full_screen_observer_iter.GetNext());
-  DCHECK(!full_screen_observer_iter.GetNext());
-
+  set_display_area_observer(old_provider->display_area_observer());
+  set_desktop_bar_observer(old_provider->desktop_bar_observer());
   panel_manager->set_display_settings_provider(this);
 
   memset(mock_desktop_bars, 0, sizeof(mock_desktop_bars));
 }
 
 gfx::Rect MockDisplaySettingsProviderImpl::GetWorkArea() const {
   // Some test might want to use the actual work area, that is indicated by
   // passing empty testing work area.
   return testing_work_area_.IsEmpty() ? DisplaySettingsProvider::GetWorkArea()
                                       : testing_work_area_;
@@ skipping 382 matching lines @@
 }
 
 void BasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
   PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
 }
 
 std::string BasePanelBrowserTest::MakePanelName(int index) {
   std::string panel_name("Panel");
   return panel_name + base::IntToString(index);
 }