aura: Fix Chrome OS status area browser tests.

chrome/browser/chromeos/status/power_menu_button_browsertest.cc

 // Copyright (c) 2011 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/chromeos/status/power_menu_button.h"
 
 #include "chrome/browser/chromeos/frame/browser_view.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "views/view.h"
+
+#if defined(USE_AURA)
+#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
+#endif
 
 namespace chromeos {
 
 class PowerMenuButtonTest : public InProcessBrowserTest {
  protected:
   PowerMenuButtonTest() : InProcessBrowserTest() {
   }
 
   virtual void SetUpInProcessBrowserTestFixture() {
   }
 
   PowerMenuButton* GetPowerMenuButton() {
-    BrowserView* view = static_cast<BrowserView*>(browser()->window());
-    return static_cast<PowerMenuButton*>(view->GetViewByID(
-        VIEW_ID_STATUS_BUTTON_POWER));
+    const views::View* view =
+#if defined(USE_AURA)
+        ChromeShellDelegate::instance()->GetStatusArea();
+#else
+        static_cast<BrowserView*>(browser()->window());
+#endif
+    return const_cast<PowerMenuButton*>(

[Daniel Erat, 2011/11/19 01:49:11]

This is somewhat gross.  Scott, what's the plan for GetStatusArea()?  If it's
just for tests, perhaps it could be made to return a non-const view and be
renamed to GetStatusAreaForTest().

[sky, 2011/11/19 23:26:52]

I was hoping we could keep it const as most tests shouldn't need to modify it.
Does this test really need it to be non-const? But, as you say, the method is
really for testing so if it needs to be non-const go ahead and change it. 

[Daniel Erat, 2011/11/21 16:45:51]

I'm happy leaving it const if you're okay with the const_cast here.  The tests
in this file look like they're checking what the PowerMenuButton does when it's
told that the power status has changed, so I don't think they can be adapted to
use a const button.

+        static_cast<const PowerMenuButton*>(
+            view->GetViewByID(VIEW_ID_STATUS_BUTTON_POWER)));
   }
 
   string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) {
     PowerMenuButton* power = GetPowerMenuButton();
 
     power->PowerChanged(status);
     EXPECT_TRUE(power->IsVisible());
 
     string16 tooltip;
     // There is static_cast<StatusAreaButton*> because GetTootipText is also
@@ skipping 97 matching lines @@
   // Simulate various levels of discharging.
   for (double percent = 5.0; percent < 100.0; percent += 5.0) {
     status.battery_percentage = percent;
     const string16 tooltip_after = CallPowerChangedAndGetTooltipText(status);
     EXPECT_NE(tooltip_before, tooltip_after);
     tooltip_before = tooltip_after;
   }
 }
 
 }  // namespace chromeos