Revert of arc: Implement silent OptIn mode for managed Arc.

chrome/browser/chromeos/arc/arc_support_host.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 
 #include <string>
 
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "base/i18n/timezone.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/known_user.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 
 namespace {
 const char kAction[] = "action";
+const char kCode[] = "code";
 const char kCanEnable[] = "canEnable";
-const char kCode[] = "code";
-const char kCountryCode[] = "countryCode";
+const char kStatus[] = "status";
 const char kData[] = "data";
 const char kDeviceId[] = "deviceId";
 const char kOn[] = "on";
-const char kSilentMode[] = "silentMode";
-const char kStatus[] = "status";
 const char kPage[] = "page";
 const char kText[] = "text";
 const char kActionInitialize[] = "initialize";
 const char kActionSetMetricsMode[] = "setMetricsMode";
 const char kActionStartLso[] = "startLso";
 const char kActionCancelAuthCode[] = "cancelAuthCode";
 const char kActionSetAuthCode[] = "setAuthCode";
 const char kActionEnableMetrics[] = "enableMetrics";
 const char kActionSendFeedback[] = "sendFeedback";
 const char kActionCloseUI[] = "closeUI";
@@ skipping 82 matching lines @@
       l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_PROGRESS_ANDROID));
   localized_strings->SetString(
       "authorizationFailed",
       l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_AUTHORIZATION_FAILED));
   localized_strings->SetString(
       "termsOfService",
       l10n_util::GetStringUTF16(IDS_ARC_OPT_IN_DIALOG_TERMS_OF_SERVICE));
 
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   const std::string& country_code = base::CountryCodeForCurrentTimezone();
-  localized_strings->SetString(kCountryCode, country_code);
+  localized_strings->SetString("countryCode", country_code);
 
   webui::SetLoadTimeDataDefaults(app_locale, localized_strings.get());
 
   arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
   DCHECK(arc_auth_service);
   const std::string device_id = user_manager::known_user::GetDeviceId(
       multi_user_util::GetAccountIdFromProfile(arc_auth_service->profile()));
   DCHECK(!device_id.empty());
 
   base::DictionaryValue request;
   std::string request_string;
   request.SetString(kAction, kActionInitialize);
   request.Set(kData, std::move(localized_strings));
   request.SetString(kDeviceId, device_id);
-  request.SetBoolean(kSilentMode, arc_auth_service->IsArcManaged());
-
   base::JSONWriter::Write(request, &request_string);
   client_->PostMessageFromNativeHost(request_string);
 }
 
 void ArcSupportHost::OnMetricsPreferenceChanged() {
   SendMetricsMode();
 }
 
 void ArcSupportHost::SendMetricsMode() {
   arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
@@ skipping 90 matching lines @@
     chrome::OpenFeedbackDialog(nullptr);
   } else {
     NOTREACHED();
   }
 }
 
 scoped_refptr<base::SingleThreadTaskRunner> ArcSupportHost::task_runner()
     const {
   return base::ThreadTaskRunnerHandle::Get();
 }