Revert "Use the Windows MDM API to check if the machine is being managed."

components/update_client/updater_state.cc

 
 // Copyright (c) 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 "components/update_client/updater_state.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 
 namespace update_client {
 
-// The value of this constant does not reflect its name (i.e. "domainjoined"
-// vs something like "isenterprisemanaged") because it is used with omaha.
-// After discussion with omaha team it was decided to leave the value as is to
-// keep continuity with previous chrome versions.
-const char UpdaterState::kIsEnterpriseManaged[] = "domainjoined";
+const char UpdaterState::kDomainJoined[] = "domainjoined";
 
 UpdaterState::UpdaterState(bool is_machine) : is_machine_(is_machine) {}
 
 UpdaterState::~UpdaterState() {}
 
 std::unique_ptr<UpdaterState::Attributes> UpdaterState::GetState(
     bool is_machine) {
 #if defined(OS_WIN)
   UpdaterState updater_state(is_machine);
   updater_state.ReadState();
   return base::MakeUnique<Attributes>(updater_state.BuildAttributes());
 #else
   return nullptr;
 #endif  // OS_WIN
 }
 
 #if defined(OS_WIN)
 void UpdaterState::ReadState() {
-  is_enterprise_managed_ = IsEnterpriseManaged();
+  is_joined_to_domain_ = IsJoinedToDomain();
 
 #if defined(GOOGLE_CHROME_BUILD)
   updater_name_ = GetUpdaterName();
   updater_version_ = GetUpdaterVersion(is_machine_);
   last_autoupdate_started_ = GetUpdaterLastStartedAU(is_machine_);
   last_checked_ = GetUpdaterLastChecked(is_machine_);
   is_autoupdate_check_enabled_ = IsAutoupdateCheckEnabled();
   update_policy_ = GetUpdatePolicy();
 #endif  // GOOGLE_CHROME_BUILD
 }
 #endif  // OS_WIN
 
 UpdaterState::Attributes UpdaterState::BuildAttributes() const {
   Attributes attributes;
 
-  attributes[kIsEnterpriseManaged] = is_enterprise_managed_ ? "1" : "0";
+  attributes[kDomainJoined] = is_joined_to_domain_ ? "1" : "0";
 
   attributes["name"] = updater_name_;
 
   if (updater_version_.IsValid())
     attributes["version"] = updater_version_.GetString();
 
   const base::Time now = base::Time::NowFromSystemTime();
   if (!last_autoupdate_started_.is_null())
     attributes["laststarted"] =
         NormalizeTimeDelta(now - last_autoupdate_started_);
@@ skipping 20 matching lines @@
     val = "408";  // 2 weeks in hours.
   } else {
     val = "1344";  // 2*28 days in hours.
   }
 
   DCHECK(!val.empty());
   return val;
 }
 
 }  // namespace update_client