Merge 110560 - Make power button in status view invisible until we are sure battery is supported ...

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"
@@ skipping 53 matching lines @@
   EXPECT_CALL(*mock_power_library_, IsLinePowerOn())
       .WillOnce((Return(false)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_power_library_, GetBatteryTimeToEmpty())
       .WillOnce((Return(base::TimeDelta::FromMinutes(42))))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_power_library_, GetBatteryTimeToFull())
       .WillOnce((Return(base::TimeDelta::FromMinutes(24))))
       .RetiresOnSaturation();
   EXPECT_EQ(-1, CallPowerChangedAndGetBatteryIndex());
+  
+  PowerMenuButton* power = GetPowerMenuButton();
+
+  EXPECT_FALSE(power->IsVisible());
 }
 
 IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryChargedTest) {
   EXPECT_CALL(*mock_power_library_, IsBatteryPresent())
       .WillOnce((Return(true)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_power_library_, GetBatteryPercentage())
       .WillOnce((Return(42.0)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_power_library_, IsBatteryFullyCharged())
@@ skipping 71 matching lines @@
   for (float percent = 5.0; percent < 100.0; percent += 5.0) {
     EXPECT_CALL(*mock_power_library_, GetBatteryPercentage())
         .WillOnce((Return(percent)))
         .RetiresOnSaturation();
     EXPECT_EQ(index, CallPowerChangedAndGetBatteryIndex());
     index++;
   }
 }
 
 }  // namespace chromeos