| Index: components/arc/user_data/arc_user_data_service.cc
|
| diff --git a/components/arc/user_data/arc_user_data_service.cc b/components/arc/user_data/arc_user_data_service.cc
|
| index 27d42d729bc0b27044c87efc9241460aa2916e5c..f946de54faabcce578e70d8b40b98aac0358ddbc 100644
|
| --- a/components/arc/user_data/arc_user_data_service.cc
|
| +++ b/components/arc/user_data/arc_user_data_service.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "components/arc/user_data/arc_user_data_service.h"
|
|
|
| +#include "base/command_line.h"
|
| +#include "chromeos/chromeos_switches.h"
|
| #include "chromeos/cryptohome/cryptohome_parameters.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/dbus/session_manager_client.h"
|
| @@ -49,8 +51,11 @@ void ArcUserDataService::ClearIfDisabled() {
|
| LOG(ERROR) << "ARC instance not stopped, user data can't be cleared";
|
| return;
|
| }
|
| - if (arc_enabled_pref_->GetValue())
|
| + if (arc_enabled_pref_->GetValue() ||
|
| + base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + chromeos::switches::kDisableArcDataWipe)) {
|
| return;
|
| + }
|
| const cryptohome::Identification cryptohome_id(primary_user_account_id_);
|
| chromeos::SessionManagerClient* session_manager_client =
|
| chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
|
|
|