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/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/cros/mock_power_library.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 "grit/theme_resources.h"
 
 namespace {
 const int kNumBatteryStates = 20;
 }
 namespace chromeos {
 using ::testing::AnyNumber;
 using ::testing::InvokeWithoutArgs;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::_;
 
 class PowerMenuButtonTest : public CrosInProcessBrowserTest {
  protected:
   PowerMenuButtonTest() : CrosInProcessBrowserTest() {
   }
 
   virtual void SetUpInProcessBrowserTestFixture() {
     cros_mock_->InitStatusAreaMocks();
     cros_mock_->SetStatusAreaMocksExpectations();
   }
 
   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));
   }
 
   int CallPowerChangedAndGetBatteryIndex(const PowerSupplyStatus& status) {
     PowerMenuButton* power = GetPowerMenuButton();
     power->PowerChanged(status);
     return power->battery_index();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryMissingTest) {
@@ skipping 50 matching lines @@
   // Simulate various levels of discharging.
   int index = 0;
   for (float percent = 5.0; percent < 100.0; percent += 5.0) {
     status.battery_percentage = percent;
     EXPECT_EQ(index, CallPowerChangedAndGetBatteryIndex(status));
     index++;
   }
 }
 
 }  // namespace chromeos