| 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 69f1c7d8405bb3a190d56689facb01c10c3f72c5..81c2b60418ed43773dccf8cfd700f9116a55cda6 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 {
|
|
|
| @@ -1331,9 +1331,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,
|
|
|