Separate StatusAreaView from StatusAreaViewChromeos

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/status/status_area_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"
 
 namespace chromeos {
 
 class PowerMenuButtonTest : public InProcessBrowserTest {
  protected:
   PowerMenuButtonTest() : InProcessBrowserTest() {
   }
 
   virtual void SetUpInProcessBrowserTestFixture() {
   }
 
   PowerMenuButton* GetPowerMenuButton() {
     BrowserView* view = static_cast<BrowserView*>(browser()->window());
-    PowerMenuButton* power = static_cast<StatusAreaView*>(view->
-        GetViewByID(VIEW_ID_STATUS_AREA))->power_view();
-    return power;
+    return static_cast<PowerMenuButton*>(view->GetViewByID(
+        VIEW_ID_STATUS_BUTTON_POWER));
   }
 
   string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) {
     PowerMenuButton* power = GetPowerMenuButton();
     power->PowerChanged(status);
     string16 tooltip;
     // There is static_cast<StatusAreaButton*> because GetTootipText is also
     // declared in MenuDelegate
     EXPECT_TRUE(static_cast<StatusAreaButton*>(power)->GetTooltipText(
         gfx::Point(0, 0), &tooltip));
@@ skipping 75 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