Prepare status area to support multiple trays.

ash/focus_cycler_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/focus_cycler.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
@@ skipping 16 matching lines @@
 
 namespace {
 
 internal::StatusAreaWidgetDelegate* GetStatusAreaWidgetDelegate(
     views::Widget* widget) {
   return static_cast<internal::StatusAreaWidgetDelegate*>(
       widget->GetContentsView());
 }
 
 SystemTray* CreateSystemTray() {
-  SystemTray* tray = new SystemTray;
   internal::StatusAreaWidget* widget = new internal::StatusAreaWidget;
-  widget->AddTray(tray);
+  widget->CreateTrayViews(NULL);
   widget->Show();
-  return tray;
+  return widget->system_tray();
 }
 
 }  // namespace
 
 typedef AshTestBase FocusCyclerTest;
 
 TEST_F(FocusCyclerTest, CycleFocusBrowserOnly) {
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Create a single test window.
@@ skipping 179 matching lines @@
   focus_cycler->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 }  // namespace test
 }  // namespace ash