summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/automation/testing_automation_provider_chromeos.cc1
-rw-r--r--chrome/browser/chromeos/cros/cros_library.cc3
-rw-r--r--chrome/browser/chromeos/cros/cros_library.h4
-rw-r--r--chrome/browser/chromeos/cros/cros_mock.cc31
-rw-r--r--chrome/browser/chromeos/cros/cros_mock.h6
-rw-r--r--chrome/browser/chromeos/cros/mock_power_library.cc13
-rw-r--r--chrome/browser/chromeos/cros/mock_power_library.h28
-rw-r--r--chrome/browser/chromeos/cros/power_library.cc110
-rw-r--r--chrome/browser/chromeos/cros/power_library.h42
-rw-r--r--chrome/browser/chromeos/login/login_browsertest.cc1
-rw-r--r--chrome/browser/chromeos/status/power_menu_button.h4
-rw-r--r--chrome/chrome_browser.gypi2
-rw-r--r--chrome/chrome_tests.gypi2
13 files changed, 2 insertions, 245 deletions
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 821e9ef..ec180d5 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/chromeos/audio_handler.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/cros/power_library.h"
#include "chrome/browser/chromeos/cros/screen_lock_library.h"
#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
#include "chrome/browser/chromeos/dbus/update_engine_client.h"
diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc
index 50bbf21..3e84fb1 100644
--- a/chrome/browser/chromeos/cros/cros_library.cc
+++ b/chrome/browser/chromeos/cros/cros_library.cc
@@ -9,7 +9,6 @@
#include "chrome/browser/chromeos/cros/cryptohome_library.h"
#include "chrome/browser/chromeos/cros/library_loader.h"
#include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/cros/power_library.h"
#include "chrome/browser/chromeos/cros/screen_lock_library.h"
#include "third_party/cros/chromeos_cros_api.h"
@@ -81,7 +80,6 @@ DEFINE_GET_LIBRARY_METHOD(Burn, burn);
DEFINE_GET_LIBRARY_METHOD(Cert, cert);
DEFINE_GET_LIBRARY_METHOD(Cryptohome, crypto);
DEFINE_GET_LIBRARY_METHOD(Network, network);
-DEFINE_GET_LIBRARY_METHOD(Power, power);
DEFINE_GET_LIBRARY_METHOD(ScreenLock, screen_lock);
bool CrosLibrary::LoadLibcros() {
@@ -125,7 +123,6 @@ DEFINE_SET_LIBRARY_METHOD(Cert, cert);
DEFINE_SET_LIBRARY_METHOD(Burn, burn);
DEFINE_SET_LIBRARY_METHOD(Cryptohome, crypto);
DEFINE_SET_LIBRARY_METHOD(Network, network);
-DEFINE_SET_LIBRARY_METHOD(Power, power);
DEFINE_SET_LIBRARY_METHOD(ScreenLock, screen_lock);
} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/cros_library.h b/chrome/browser/chromeos/cros/cros_library.h
index 8c28ab5..2453515 100644
--- a/chrome/browser/chromeos/cros/cros_library.h
+++ b/chrome/browser/chromeos/cros/cros_library.h
@@ -21,7 +21,6 @@ class CertLibrary;
class CryptohomeLibrary;
class LibraryLoader;
class NetworkLibrary;
-class PowerLibrary;
class ScreenLockLibrary;
// This class handles access to sub-parts of ChromeOS library. it provides
@@ -46,7 +45,6 @@ class CrosLibrary {
void SetBurnLibrary(BurnLibrary* library, bool own);
void SetCryptohomeLibrary(CryptohomeLibrary* library, bool own);
void SetNetworkLibrary(NetworkLibrary* library, bool own);
- void SetPowerLibrary(PowerLibrary* library, bool own);
void SetScreenLockLibrary(ScreenLockLibrary* library, bool own);
private:
@@ -70,7 +68,6 @@ class CrosLibrary {
CertLibrary* GetCertLibrary();
CryptohomeLibrary* GetCryptohomeLibrary();
NetworkLibrary* GetNetworkLibrary();
- PowerLibrary* GetPowerLibrary();
ScreenLockLibrary* GetScreenLockLibrary();
// Getter for Test API that gives access to internal members of this class.
@@ -134,7 +131,6 @@ class CrosLibrary {
Library<CertLibrary> cert_lib_;
Library<CryptohomeLibrary> crypto_lib_;
Library<NetworkLibrary> network_lib_;
- Library<PowerLibrary> power_lib_;
Library<ScreenLockLibrary> screen_lock_lib_;
// Stub implementations of the libraries should be used.
diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc
index 36e310e..36b10c8 100644
--- a/chrome/browser/chromeos/cros/cros_mock.cc
+++ b/chrome/browser/chromeos/cros/cros_mock.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
#include "chrome/browser/chromeos/cros/mock_library_loader.h"
#include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/chromeos/cros/mock_power_library.h"
#include "chrome/browser/chromeos/cros/mock_screen_lock_library.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/login/wizard_screen.h"
@@ -34,7 +33,6 @@ CrosMock::CrosMock()
: loader_(NULL),
mock_cryptohome_library_(NULL),
mock_network_library_(NULL),
- mock_power_library_(NULL),
mock_screen_lock_library_(NULL) {
}
@@ -47,7 +45,6 @@ chromeos::CrosLibrary::TestApi* CrosMock::test_api() {
void CrosMock::InitStatusAreaMocks() {
InitMockNetworkLibrary();
- InitMockPowerLibrary();
}
void CrosMock::InitMockLibraryLoader() {
@@ -76,14 +73,6 @@ void CrosMock::InitMockNetworkLibrary() {
test_api()->SetNetworkLibrary(mock_network_library_, true);
}
-void CrosMock::InitMockPowerLibrary() {
- InitMockLibraryLoader();
- if (mock_power_library_)
- return;
- mock_power_library_ = new StrictMock<MockPowerLibrary>();
- test_api()->SetPowerLibrary(mock_power_library_, true);
-}
-
void CrosMock::InitMockScreenLockLibrary() {
InitMockLibraryLoader();
if (mock_screen_lock_library_)
@@ -101,18 +90,12 @@ MockNetworkLibrary* CrosMock::mock_network_library() {
return mock_network_library_;
}
-MockPowerLibrary* CrosMock::mock_power_library() {
- return mock_power_library_;
-}
-
MockScreenLockLibrary* CrosMock::mock_screen_lock_library() {
return mock_screen_lock_library_;
}
void CrosMock::SetStatusAreaMocksExpectations() {
SetNetworkLibraryStatusAreaExpectations();
- SetPowerLibraryStatusAreaExpectations();
- SetPowerLibraryExpectations();
}
void CrosMock::SetNetworkLibraryStatusAreaExpectations() {
@@ -220,18 +203,6 @@ void CrosMock::SetNetworkLibraryStatusAreaExpectations() {
.RetiresOnSaturation();
}
-void CrosMock::SetPowerLibraryStatusAreaExpectations() {
- EXPECT_CALL(*mock_power_library_, AddObserver(_))
- .Times(AnyNumber())
- .RetiresOnSaturation();
- EXPECT_CALL(*mock_power_library_, RemoveObserver(_))
- .Times(AnyNumber())
- .RetiresOnSaturation();
-}
-
-void CrosMock::SetPowerLibraryExpectations() {
-}
-
void CrosMock::TearDownMocks() {
// Prevent bogus gMock leak check from firing.
if (loader_)
@@ -240,8 +211,6 @@ void CrosMock::TearDownMocks() {
test_api()->SetCryptohomeLibrary(NULL, false);
if (mock_network_library_)
test_api()->SetNetworkLibrary(NULL, false);
- if (mock_power_library_)
- test_api()->SetPowerLibrary(NULL, false);
if (mock_screen_lock_library_)
test_api()->SetScreenLockLibrary(NULL, false);
}
diff --git a/chrome/browser/chromeos/cros/cros_mock.h b/chrome/browser/chromeos/cros/cros_mock.h
index 5435777..0484bf1 100644
--- a/chrome/browser/chromeos/cros/cros_mock.h
+++ b/chrome/browser/chromeos/cros/cros_mock.h
@@ -15,7 +15,6 @@ class MockCryptohomeLibrary;
class MockKeyboardLibrary;
class MockLibraryLoader;
class MockNetworkLibrary;
-class MockPowerLibrary;
class MockScreenLockLibrary;
// Class for initializing mocks for some parts of CrosLibrary. Once you mock
@@ -42,14 +41,12 @@ class CrosMock {
void InitMockCryptohomeLibrary();
void InitMockKeyboardLibrary();
void InitMockNetworkLibrary();
- void InitMockPowerLibrary();
void InitMockScreenLockLibrary();
// Get mocks.
MockCryptohomeLibrary* mock_cryptohome_library();
MockKeyboardLibrary* mock_keyboard_library();
MockNetworkLibrary* mock_network_library();
- MockPowerLibrary* mock_power_library();
MockScreenLockLibrary* mock_screen_lock_library();
// This method sets up corresponding expectations for basic mocks that
@@ -63,8 +60,6 @@ class CrosMock {
// Methods to setup minimal mocks expectations for status area.
void SetKeyboardLibraryStatusAreaExpectations();
void SetNetworkLibraryStatusAreaExpectations();
- void SetPowerLibraryStatusAreaExpectations();
- void SetPowerLibraryExpectations();
void TearDownMocks();
@@ -77,7 +72,6 @@ class CrosMock {
MockCryptohomeLibrary* mock_cryptohome_library_;
MockKeyboardLibrary* mock_keyboard_library_;
MockNetworkLibrary* mock_network_library_;
- MockPowerLibrary* mock_power_library_;
MockScreenLockLibrary* mock_screen_lock_library_;
WifiNetworkVector wifi_networks_;
diff --git a/chrome/browser/chromeos/cros/mock_power_library.cc b/chrome/browser/chromeos/cros/mock_power_library.cc
deleted file mode 100644
index 541a609..0000000
--- a/chrome/browser/chromeos/cros/mock_power_library.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2010 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/cros/mock_power_library.h"
-
-namespace chromeos {
-
-MockPowerLibrary::MockPowerLibrary() {}
-
-MockPowerLibrary::~MockPowerLibrary() {}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/mock_power_library.h b/chrome/browser/chromeos/cros/mock_power_library.h
deleted file mode 100644
index cd4d0a1..0000000
--- a/chrome/browser/chromeos/cros/mock_power_library.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_MOCK_POWER_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_MOCK_POWER_LIBRARY_H_
-#pragma once
-
-#include "base/time.h"
-#include "chrome/browser/chromeos/cros/power_library.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-namespace chromeos {
-
-class MockPowerLibrary : public PowerLibrary {
- public:
- MockPowerLibrary();
- virtual ~MockPowerLibrary();
-
- MOCK_METHOD0(Init, void(void));
-
- MOCK_METHOD1(AddObserver, void(Observer*));
- MOCK_METHOD1(RemoveObserver, void(Observer*));
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_CROS_MOCK_POWER_LIBRARY_H_
diff --git a/chrome/browser/chromeos/cros/power_library.cc b/chrome/browser/chromeos/cros/power_library.cc
deleted file mode 100644
index 878c735..0000000
--- a/chrome/browser/chromeos/cros/power_library.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// 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/cros/power_library.h"
-
-#include <algorithm>
-
-#include "base/basictypes.h"
-#include "base/bind.h"
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "base/observer_list.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "content/public/browser/browser_thread.h"
-#include "third_party/cros/chromeos_power.h"
-#include "third_party/cros/chromeos_resume.h"
-
-using content::BrowserThread;
-
-namespace chromeos {
-
-class PowerLibraryImpl : public PowerLibrary {
- public:
- PowerLibraryImpl()
- : resume_status_connection_(NULL) {
- }
-
- virtual ~PowerLibraryImpl() {
- if (resume_status_connection_) {
- chromeos::DisconnectResume(resume_status_connection_);
- resume_status_connection_ = NULL;
- }
- }
-
- // Begin PowerLibrary implementation.
- virtual void Init() OVERRIDE {
- DCHECK(CrosLibrary::Get()->libcros_loaded());
- resume_status_connection_ =
- chromeos::MonitorResume(&SystemResumedHandler, this);
- }
-
- virtual void AddObserver(Observer* observer) OVERRIDE {
- observers_.AddObserver(observer);
- }
-
- virtual void RemoveObserver(Observer* observer) OVERRIDE {
- observers_.RemoveObserver(observer);
- }
-
- // End PowerLibrary implementation.
-
- private:
-
- static void SystemResumedHandler(void* object) {
- PowerLibraryImpl* power = static_cast<PowerLibraryImpl*>(object);
- power->SystemResumed();
- }
-
- void SystemResumed() {
- // Called from SystemResumedHandler, a libcros callback which should
- // always run on UI thread.
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- FOR_EACH_OBSERVER(Observer, observers_, SystemResumed());
- }
-
- ObserverList<Observer> observers_;
-
- // A reference to the resume alerts.
- chromeos::ResumeConnection resume_status_connection_;
-
- DISALLOW_COPY_AND_ASSIGN(PowerLibraryImpl);
-};
-
-// The stub implementation runs the battery up and down, pausing at the
-// fully charged and fully depleted states.
-class PowerLibraryStubImpl : public PowerLibrary {
- public:
- PowerLibraryStubImpl() {
- }
-
- virtual ~PowerLibraryStubImpl() {}
-
- // Begin PowerLibrary implementation.
- virtual void Init() OVERRIDE {}
- virtual void AddObserver(Observer* observer) OVERRIDE {
- observers_.AddObserver(observer);
- }
-
- virtual void RemoveObserver(Observer* observer) OVERRIDE {
- observers_.RemoveObserver(observer);
- }
-
- // End PowerLibrary implementation.
- private:
- ObserverList<Observer> observers_;
-};
-
-// static
-PowerLibrary* PowerLibrary::GetImpl(bool stub) {
- PowerLibrary* impl;
- if (stub)
- impl = new PowerLibraryStubImpl();
- else
- impl = new PowerLibraryImpl();
- impl->Init();
- return impl;
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/power_library.h b/chrome/browser/chromeos/cros/power_library.h
deleted file mode 100644
index d732ef6..0000000
--- a/chrome/browser/chromeos/cros/power_library.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
-#pragma once
-
-// TODO(sque): Move to chrome/browser/chromeos/system, crosbug.com/16558
-
-#include "base/callback.h"
-
-namespace chromeos {
-
-// This interface defines interaction with the ChromeOS power library APIs.
-// Classes can add themselves as observers. Users can get an instance of this
-// library class like this: chromeos::CrosLibrary::Get()->GetPowerLibrary()
-class PowerLibrary {
- public:
- class Observer {
- public:
- virtual void SystemResumed() = 0;
-
- protected:
- virtual ~Observer() {}
- };
-
- virtual ~PowerLibrary() {}
-
- virtual void Init() = 0;
-
- virtual void AddObserver(Observer* observer) = 0;
- virtual void RemoveObserver(Observer* observer) = 0;
-
- // Factory function, creates a new instance and returns ownership.
- // For normal usage, access the singleton via CrosLibrary::Get().
- static PowerLibrary* GetImpl(bool stub);
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index 04d80b7..ebbf3e8 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
#include "chrome/browser/chromeos/cros/mock_library_loader.h"
#include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/chromeos/cros/mock_power_library.h"
#include "chrome/browser/chromeos/cros/mock_screen_lock_library.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h
index b6e8e16..165e54b 100644
--- a/chrome/browser/chromeos/status/power_menu_button.h
+++ b/chrome/browser/chromeos/status/power_menu_button.h
@@ -37,7 +37,7 @@ class PowerMenuButton : public StatusAreaButton,
// views::MenuDelegate implementation.
virtual string16 GetLabel(int id) const OVERRIDE;
- // PowerLibrary::Observer implementation.
+ // PowerManagerClient::Observer implementation.
virtual void PowerChanged(const PowerSupplyStatus& power_status) OVERRIDE;
virtual void SystemResumed() OVERRIDE {}
@@ -65,7 +65,7 @@ class PowerMenuButton : public StatusAreaButton,
void UpdateBatteryTime(base::TimeDelta* previous,
const base::TimeDelta& current);
- // Stored data gathered from CrosLibrary::PowerLibrary.
+ // Stored data gathered from PowerManagerClient.
bool battery_is_present_;
bool line_power_on_;
double battery_percentage_;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 62529ef..7fe7e62 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -424,8 +424,6 @@
'browser/chromeos/cros/network_parser.h',
'browser/chromeos/cros/onc_network_parser.cc',
'browser/chromeos/cros/onc_network_parser.h',
- 'browser/chromeos/cros/power_library.cc',
- 'browser/chromeos/cros/power_library.h',
'browser/chromeos/cros/screen_lock_library.cc',
'browser/chromeos/cros/screen_lock_library.h',
'browser/chromeos/cros_settings.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a237255..b598fc1 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2449,8 +2449,6 @@
'browser/chromeos/cros/cros_in_process_browser_test.h',
'browser/chromeos/cros/cros_mock.cc',
'browser/chromeos/cros/cros_mock.h',
- 'browser/chromeos/cros/mock_power_library.cc',
- 'browser/chromeos/cros/mock_power_library.h',
'browser/chromeos/cros/mock_screen_lock_library.cc',
'browser/chromeos/cros/mock_screen_lock_library.h',
'browser/chromeos/disks/mock_disk_mount_manager.cc',
generated by cgit v1.1 at 2025-03-17 02:55:54 +0000