| Index: chrome/browser/automation/testing_automation_provider_chromeos.cc
|
| diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
|
| index 23ba9416e324c83933935a987c40bb14f3a61e80..bbe413957304fc666465daa7173c2cb6f4ffa87f 100644
|
| --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
|
| @@ -78,7 +78,7 @@ void TestingAutomationProvider::PowerChanged(
|
| #endif
|
|
|
| void TestingAutomationProvider::AcceptOOBENetworkScreen(
|
| - DictionaryValue* args,
|
| + base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| WizardController* wizard_controller = WizardController::default_controller();
|
| if (!wizard_controller || wizard_controller->current_screen()->GetName() !=
|
| @@ -92,7 +92,7 @@ void TestingAutomationProvider::AcceptOOBENetworkScreen(
|
| wizard_controller->GetNetworkScreen()->OnContinuePressed();
|
| }
|
|
|
| -void TestingAutomationProvider::AcceptOOBEEula(DictionaryValue* args,
|
| +void TestingAutomationProvider::AcceptOOBEEula(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| bool accepted;
|
| bool usage_stats_reporting;
|
| @@ -115,11 +115,11 @@ void TestingAutomationProvider::AcceptOOBEEula(DictionaryValue* args,
|
| wizard_controller->GetEulaScreen()->OnExit(accepted, usage_stats_reporting);
|
| }
|
|
|
| -void TestingAutomationProvider::CancelOOBEUpdate(DictionaryValue* args,
|
| +void TestingAutomationProvider::CancelOOBEUpdate(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| if (chromeos::StartupUtils::IsOobeCompleted()) {
|
| // Update already finished.
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
| return_value->SetString("next_screen",
|
| WizardController::kLoginScreenName);
|
| AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
|
| @@ -137,10 +137,10 @@ void TestingAutomationProvider::CancelOOBEUpdate(DictionaryValue* args,
|
| wizard_controller->GetUpdateScreen()->CancelUpdate();
|
| }
|
|
|
| -void TestingAutomationProvider::GetLoginInfo(DictionaryValue* args,
|
| +void TestingAutomationProvider::GetLoginInfo(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
|
|
| const UserManager* user_manager = UserManager::Get();
|
| if (!user_manager)
|
| @@ -177,7 +177,7 @@ void TestingAutomationProvider::GetLoginInfo(DictionaryValue* args,
|
|
|
| // See the note under LoginAsGuest(). CreateAccount() causes a login as guest.
|
| void TestingAutomationProvider::ShowCreateAccountUI(
|
| - DictionaryValue* args, IPC::Message* reply_message) {
|
| + base::DictionaryValue* args, IPC::Message* reply_message) {
|
| ExistingUserController* controller =
|
| ExistingUserController::current_controller();
|
| // Return immediately, since we're going to die before the login is finished.
|
| @@ -187,7 +187,7 @@ void TestingAutomationProvider::ShowCreateAccountUI(
|
|
|
| // Logging in as guest will cause session_manager to restart Chrome with new
|
| // flags. If you used EnableChromeTesting, you will have to call it again.
|
| -void TestingAutomationProvider::LoginAsGuest(DictionaryValue* args,
|
| +void TestingAutomationProvider::LoginAsGuest(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| ExistingUserController* controller =
|
| ExistingUserController::current_controller();
|
| @@ -196,7 +196,7 @@ void TestingAutomationProvider::LoginAsGuest(DictionaryValue* args,
|
| controller->LoginAsGuest();
|
| }
|
|
|
| -void TestingAutomationProvider::SubmitLoginForm(DictionaryValue* args,
|
| +void TestingAutomationProvider::SubmitLoginForm(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
|
|
| @@ -225,7 +225,7 @@ void TestingAutomationProvider::SubmitLoginForm(DictionaryValue* args,
|
| }
|
|
|
| void TestingAutomationProvider::AddLoginEventObserver(
|
| - DictionaryValue* args, IPC::Message* reply_message) {
|
| + base::DictionaryValue* args, IPC::Message* reply_message) {
|
| ExistingUserController* controller =
|
| ExistingUserController::current_controller();
|
| AutomationJSONReply reply(this, reply_message);
|
| @@ -242,12 +242,12 @@ void TestingAutomationProvider::AddLoginEventObserver(
|
| new LoginEventObserver(automation_event_queue_.get(), this));
|
|
|
| // Return the observer's id.
|
| - DictionaryValue return_value;
|
| + base::DictionaryValue return_value;
|
| return_value.SetInteger("observer_id", observer_id);
|
| reply.SendSuccess(&return_value);
|
| }
|
|
|
| -void TestingAutomationProvider::SignOut(DictionaryValue* args,
|
| +void TestingAutomationProvider::SignOut(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| ash::Shell::GetInstance()->system_tray_delegate()->SignOut();
|
| // Sign out has the side effect of restarting the session_manager
|
| @@ -257,7 +257,7 @@ void TestingAutomationProvider::SignOut(DictionaryValue* args,
|
| AutomationJSONReply(this, reply_message).SendSuccess(NULL);
|
| }
|
|
|
| -void TestingAutomationProvider::PickUserImage(DictionaryValue* args,
|
| +void TestingAutomationProvider::PickUserImage(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| std::string image_type;
|
| int image_number = -1;
|
| @@ -295,7 +295,7 @@ void TestingAutomationProvider::PickUserImage(DictionaryValue* args,
|
| }
|
| }
|
|
|
| -void TestingAutomationProvider::SkipToLogin(DictionaryValue* args,
|
| +void TestingAutomationProvider::SkipToLogin(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| bool skip_post_login_screens;
|
| // The argument name is a legacy. If set to |true|, this argument causes any
|
| @@ -314,7 +314,7 @@ void TestingAutomationProvider::SkipToLogin(DictionaryValue* args,
|
| AutomationJSONReply reply(this, reply_message);
|
| if (ExistingUserController::current_controller()) {
|
| // Already at login screen.
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
| return_value->SetString("next_screen",
|
| WizardController::kLoginScreenName);
|
| reply.SendSuccess(return_value.get());
|
| @@ -331,11 +331,11 @@ void TestingAutomationProvider::SkipToLogin(DictionaryValue* args,
|
| wizard_controller->SkipToLoginForTesting(chromeos::LoginScreenContext());
|
| }
|
|
|
| -void TestingAutomationProvider::GetOOBEScreenInfo(DictionaryValue* args,
|
| +void TestingAutomationProvider::GetOOBEScreenInfo(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| static const char kScreenNameKey[] = "screen_name";
|
| AutomationJSONReply reply(this, reply_message);
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
|
|
| WizardController* wizard_controller = WizardController::default_controller();
|
| if (wizard_controller) {
|
| @@ -356,13 +356,13 @@ void TestingAutomationProvider::GetOOBEScreenInfo(DictionaryValue* args,
|
| reply.SendSuccess(return_value.get());
|
| }
|
|
|
| -void TestingAutomationProvider::LockScreen(DictionaryValue* args,
|
| +void TestingAutomationProvider::LockScreen(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| new ScreenLockUnlockObserver(this, reply_message, true);
|
| DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen();
|
| }
|
|
|
| -void TestingAutomationProvider::UnlockScreen(DictionaryValue* args,
|
| +void TestingAutomationProvider::UnlockScreen(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| std::string password;
|
| if (!args->GetString("password", &password)) {
|
| @@ -387,7 +387,7 @@ void TestingAutomationProvider::UnlockScreen(DictionaryValue* args,
|
| // killed, so its children, including chrome and the window manager, will
|
| // also be killed. Anything owned by chronos will probably be killed.
|
| void TestingAutomationProvider::SignoutInScreenLocker(
|
| - DictionaryValue* args, IPC::Message* reply_message) {
|
| + base::DictionaryValue* args, IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| chromeos::ScreenLocker* screen_locker =
|
| chromeos::ScreenLocker::default_screen_locker();
|
| @@ -403,9 +403,9 @@ void TestingAutomationProvider::SignoutInScreenLocker(
|
| screen_locker->Signout();
|
| }
|
|
|
| -void TestingAutomationProvider::GetBatteryInfo(DictionaryValue* args,
|
| +void TestingAutomationProvider::GetBatteryInfo(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
|
|
| const bool battery_is_present = power_supply_properties_.battery_state() !=
|
| power_manager::PowerSupplyProperties_BatteryState_NOT_PRESENT;
|
| @@ -436,7 +436,7 @@ void TestingAutomationProvider::GetBatteryInfo(DictionaryValue* args,
|
| }
|
|
|
| void TestingAutomationProvider::ExecuteJavascriptInOOBEWebUI(
|
| - DictionaryValue* args, IPC::Message* reply_message) {
|
| + base::DictionaryValue* args, IPC::Message* reply_message) {
|
| std::string javascript, frame_xpath;
|
| if (!args->GetString("javascript", &javascript)) {
|
| AutomationJSONReply(this, reply_message)
|
| @@ -480,9 +480,9 @@ void TestingAutomationProvider::ExecuteJavascriptInOOBEWebUI(
|
| }
|
|
|
| void TestingAutomationProvider::EnableSpokenFeedback(
|
| - DictionaryValue* args, IPC::Message* reply_message) {
|
| + base::DictionaryValue* args, IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
| bool enabled;
|
| if (!args->GetBoolean("enabled", &enabled)) {
|
| reply.SendError("Invalid or missing args.");
|
| @@ -495,9 +495,9 @@ void TestingAutomationProvider::EnableSpokenFeedback(
|
| }
|
|
|
| void TestingAutomationProvider::IsSpokenFeedbackEnabled(
|
| - DictionaryValue* args, IPC::Message* reply_message) {
|
| + base::DictionaryValue* args, IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
| return_value->SetBoolean(
|
| "spoken_feedback",
|
| chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
| @@ -505,9 +505,9 @@ void TestingAutomationProvider::IsSpokenFeedbackEnabled(
|
| }
|
|
|
| void TestingAutomationProvider::GetTimeInfo(Browser* browser,
|
| - DictionaryValue* args,
|
| + base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
| base::Time time(base::Time::Now());
|
| bool use_24hour_clock = browser && browser->profile()->GetPrefs()->GetBoolean(
|
| prefs::kUse24HourClock);
|
| @@ -523,12 +523,12 @@ void TestingAutomationProvider::GetTimeInfo(Browser* browser,
|
| AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
|
| }
|
|
|
| -void TestingAutomationProvider::GetTimeInfo(DictionaryValue* args,
|
| +void TestingAutomationProvider::GetTimeInfo(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| GetTimeInfo(NULL, args, reply_message);
|
| }
|
|
|
| -void TestingAutomationProvider::SetTimezone(DictionaryValue* args,
|
| +void TestingAutomationProvider::SetTimezone(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| std::string timezone_id;
|
| @@ -542,17 +542,17 @@ void TestingAutomationProvider::SetTimezone(DictionaryValue* args,
|
| }
|
|
|
| void TestingAutomationProvider::UpdateCheck(
|
| - DictionaryValue* args,
|
| + base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| AutomationJSONReply* reply = new AutomationJSONReply(this, reply_message);
|
| DBusThreadManager::Get()->GetUpdateEngineClient()
|
| ->RequestUpdateCheck(base::Bind(UpdateCheckCallback, reply));
|
| }
|
|
|
| -void TestingAutomationProvider::GetVolumeInfo(DictionaryValue* args,
|
| +void TestingAutomationProvider::GetVolumeInfo(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| - scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| + scoped_ptr<base::DictionaryValue> return_value(new base::DictionaryValue);
|
| chromeos::CrasAudioHandler* audio_handler = chromeos::CrasAudioHandler::Get();
|
| if (!audio_handler) {
|
| reply.SendError("CrasAudioHandler not initialized.");
|
| @@ -563,7 +563,7 @@ void TestingAutomationProvider::GetVolumeInfo(DictionaryValue* args,
|
| reply.SendSuccess(return_value.get());
|
| }
|
|
|
| -void TestingAutomationProvider::SetVolume(DictionaryValue* args,
|
| +void TestingAutomationProvider::SetVolume(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| double volume_percent;
|
| @@ -580,7 +580,7 @@ void TestingAutomationProvider::SetVolume(DictionaryValue* args,
|
| reply.SendSuccess(NULL);
|
| }
|
|
|
| -void TestingAutomationProvider::SetMute(DictionaryValue* args,
|
| +void TestingAutomationProvider::SetMute(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| bool mute;
|
| @@ -597,7 +597,7 @@ void TestingAutomationProvider::SetMute(DictionaryValue* args,
|
| reply.SendSuccess(NULL);
|
| }
|
|
|
| -void TestingAutomationProvider::OpenCrosh(DictionaryValue* args,
|
| +void TestingAutomationProvider::OpenCrosh(base::DictionaryValue* args,
|
| IPC::Message* reply_message) {
|
| new NavigationNotificationObserver(
|
| NULL, this, reply_message, 1, false, true);
|
|
|