| Index: chrome/browser/automation/testing_automation_provider.cc
|
| diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
|
| index 5aee9eed5ed33e2a66df561cbf0ecb44bf8f4687..96c52ec43eeec38178b137c5f7787069537dd520 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -1829,7 +1829,7 @@ void TestingAutomationProvider::SetBooleanPreference(int handle,
|
| void TestingAutomationProvider::GetShowingAppModalDialog(bool* showing_dialog,
|
| int* dialog_button) {
|
| AppModalDialog* active_dialog =
|
| - Singleton<AppModalDialogQueue>()->active_dialog();
|
| + AppModalDialogQueue::GetInstance()->active_dialog();
|
| if (!active_dialog) {
|
| *showing_dialog = false;
|
| *dialog_button = MessageBoxFlags::DIALOGBUTTON_NONE;
|
| @@ -1848,7 +1848,7 @@ void TestingAutomationProvider::ClickAppModalDialogButton(int button,
|
| *success = false;
|
|
|
| NativeAppModalDialog* native_dialog =
|
| - Singleton<AppModalDialogQueue>()->active_dialog()->native_dialog();
|
| + AppModalDialogQueue::GetInstance()->active_dialog()->native_dialog();
|
| if (native_dialog &&
|
| (native_dialog->GetAppModalDialogButtons() & button) == button) {
|
| if ((button & MessageBoxFlags::DIALOGBUTTON_OK) ==
|
| @@ -1880,7 +1880,7 @@ void TestingAutomationProvider::WaitForBrowserWindowCountToBecome(
|
|
|
| void TestingAutomationProvider::WaitForAppModalDialogToBeShown(
|
| IPC::Message* reply_message) {
|
| - if (Singleton<AppModalDialogQueue>()->HasActiveDialog()) {
|
| + if (AppModalDialogQueue::GetInstance()->HasActiveDialog()) {
|
| AutomationMsg_WaitForAppModalDialogToBeShown::WriteReplyParams(
|
| reply_message, true);
|
| Send(reply_message);
|
|
|