| Index: chrome/browser/automation/testing_automation_provider.h
|
| diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
|
| index c0e5d7bd653e5d1b9f76dbf75c23b484ca7f72d9..0594edea2f0b9758fc52f0fb67f62e9c012bcc14 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.h
|
| +++ b/chrome/browser/automation/testing_automation_provider.h
|
| @@ -43,7 +43,7 @@ class TestingAutomationProvider : public AutomationProvider,
|
| public BrowserList::Observer,
|
| public importer::ImporterListObserver,
|
| #if defined(OS_CHROMEOS)
|
| - public chromeos::PowerLibrary::Observer,
|
| + public chromeos::PowerManagerClient::Observer,
|
| #endif // defined(OS_CHROMEOS)
|
| public content::NotificationObserver {
|
|
|
| @@ -1329,9 +1329,8 @@ class TestingAutomationProvider : public AutomationProvider,
|
| DictionaryValue* args,
|
| IPC::Message* reply_message);
|
|
|
| - // chromeos::PowerLibrary::Observer overrides.
|
| + // chromeos::PowerManagerClient::Observer overrides.
|
| virtual void PowerChanged(const chromeos::PowerSupplyStatus& status) OVERRIDE;
|
| - virtual void SystemResumed() OVERRIDE {}
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| void WaitForTabCountToBecome(int browser_handle,
|
|
|