ash uber tray: Make it work in ash_shell, and a couple more fixes.

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/wm/window_util.h"
@@ skipping 26 matching lines @@
 
   // Cycle the window
   focus_cycler->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusForward) {
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
-  views::Widget* status_widget = internal::CreateStatusArea();
+  views::Widget* status_widget = internal::CreateStatusArea(NULL);
   ASSERT_TRUE(status_widget);
   focus_cycler->AddWidget(status_widget);
 
   // Add a mock button to the status area.
   status_widget->GetContentsView()->AddChildView(
       new views::MenuButton(NULL, string16(), NULL, false));
 
   // Add the launcher
   Launcher* launcher = Shell::GetInstance()->launcher();
   ASSERT_TRUE(launcher);
@@ skipping 20 matching lines @@
 
   // Cycle focus to the browser
   focus_cycler->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusBackward) {
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
-  views::Widget* status_widget = internal::CreateStatusArea();
+  views::Widget* status_widget = internal::CreateStatusArea(NULL);
   ASSERT_TRUE(status_widget);
   focus_cycler->AddWidget(status_widget);
 
   // Add a mock button to the status area.
   status_widget->GetContentsView()->AddChildView(
       new views::MenuButton(NULL, string16(), NULL, false));
 
   // Add the launcher
   Launcher* launcher = Shell::GetInstance()->launcher();
   ASSERT_TRUE(launcher);
@@ skipping 18 matching lines @@
   focus_cycler->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(status_widget->IsActive());
 
   // Cycle focus to the browser
   focus_cycler->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 }  // namespace test
 }  // namespace ash