Separate the logic of popup alignment and workarea handling as delegate.

ash/system/web_notification/web_notification_tray_unittest.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 "ash/system/web_notification/web_notification_tray.h"
 
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "ash/system/web_notification/popup_alignment_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/wm/window_state.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
@@ skipping 105 matching lines @@
 
   views::Widget* GetWidget() {
     return GetTray()->GetWidget();
   }
 
   gfx::Rect GetPopupWorkArea() {
     return GetPopupWorkAreaForTray(GetTray());
   }
 
   gfx::Rect GetPopupWorkAreaForTray(WebNotificationTray* tray) {
-    return tray->popup_collection_->work_area_;
+    return tray->popup_alignment_delegate_->work_area_;
   }
 
   bool IsPopupVisible() {
     return GetTray()->IsPopupVisible();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayTest);
 };
 
@@ skipping 316 matching lines @@
 
   // System tray is created on the primary display. The popups in the secondary
   // tray aren't affected.
   GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
   EXPECT_GT(work_area.size().GetArea(), GetPopupWorkArea().size().GetArea());
   EXPECT_EQ(work_area_second.ToString(),
             GetPopupWorkAreaForTray(GetSecondaryTray()).ToString());
 }
 
 }  // namespace ash