Refactor how the updater state data is serialized in update checks.

components/update_client/updater_state_win.cc

Index: components/update_client/updater_state_win.cc
diff --git a/components/component_updater/updater_state_win.cc b/components/update_client/updater_state_win.cc
similarity index 55%
rename from components/component_updater/updater_state_win.cc
rename to components/update_client/updater_state_win.cc
index b7fd10f7f753efa0eb054ba95097632b4d165b04..396395a6d6ac3cf59c02110b0a42bf5e6ac676d8 100644
--- a/components/component_updater/updater_state_win.cc
+++ b/components/update_client/updater_state_win.cc
@@ -1,10 +1,10 @@
-
-// Copyright (c) 2016 The Chromium Authors. All rights reserved.
+// 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 "components/component_updater/updater_state_win.h"
+#include "components/update_client/updater_state.h"
 
+#include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ -15,7 +15,10 @@
 #include "base/win/registry.h"
 #include "base/win/win_util.h"
 
-namespace component_updater {
+// TODO(sorin): implement this in terms of
+// chrome/installer/util/google_update_settings (crbug.com/615187).
+
+namespace update_client {
 
 namespace {
 
@@ -41,69 +44,11 @@ const wchar_t kRegValueLastChecked[] = L"LastChecked";
 
 }  // namespace
 
-UpdaterState::UpdaterState(bool is_machine) : is_machine_(is_machine) {}
-
-std::unique_ptr<UpdaterState> UpdaterState::Create(bool is_machine) {
-  std::unique_ptr<UpdaterState> updater_state(new UpdaterState(is_machine));
-  updater_state->ReadState();
-  return updater_state;
-}
-
-void UpdaterState::ReadState() {
-  google_update_version_ = GetGoogleUpdateVersion(is_machine_);
-  last_autoupdate_started_ = GetGoogleUpdateLastStartedAU(is_machine_);
-  last_checked_ = GetGoogleUpdateLastChecked(is_machine_);
-  is_joined_to_domain_ = IsJoinedToDomain();
-  is_autoupdate_check_enabled_ = IsAutoupdateCheckEnabled();
-  chrome_update_policy_ = GetChromeUpdatePolicy();
-}
-
-update_client::InstallerAttributes UpdaterState::MakeInstallerAttributes()
-    const {
-  update_client::InstallerAttributes installer_attributes;
-
-  if (google_update_version_.IsValid())
-    installer_attributes["googleupdatever"] =
-        google_update_version_.GetString();
-
-  const base::Time now = base::Time::NowFromSystemTime();
-  if (!last_autoupdate_started_.is_null())
-    installer_attributes["laststarted"] =
-        NormalizeTimeDelta(now - last_autoupdate_started_);
-  if (!last_checked_.is_null())
-    installer_attributes["lastchecked"] =
-        NormalizeTimeDelta(now - last_checked_);
-
-  installer_attributes["domainjoined"] = is_joined_to_domain_ ? "1" : "0";
-  installer_attributes["autoupdatecheckenabled"] =
-      is_autoupdate_check_enabled_ ? "1" : "0";
-
-  DCHECK(chrome_update_policy_ >= 0 && chrome_update_policy_ <= 3 ||
-         chrome_update_policy_ == -1);
-  installer_attributes["chromeupdatepolicy"] =
-      base::IntToString(chrome_update_policy_);
-
-  return installer_attributes;
-}
-
-std::string UpdaterState::NormalizeTimeDelta(const base::TimeDelta& delta) {
-  const base::TimeDelta two_weeks = base::TimeDelta::FromDays(14);
-  const base::TimeDelta two_months = base::TimeDelta::FromDays(60);
-
-  std::string val;  // Contains the value to return in hours.
-  if (delta <= two_weeks) {
-    val = "0";
-  } else if (two_weeks < delta && delta <= two_months) {
-    val = "408";  // 2 weeks in hours.
-  } else {
-    val = "1344";  // 2*28 days in hours.
-  }
-
-  DCHECK(!val.empty());
-  return val;
+std::string UpdaterState::GetUpdaterName() {
+  return std::string("Omaha");
 }
 
-base::Version UpdaterState::GetGoogleUpdateVersion(bool is_machine) {
+base::Version UpdaterState::GetUpdaterVersion(bool is_machine) {
   const HKEY root_key = is_machine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   base::string16 version;
   base::win::RegKey key;
@@ -117,16 +62,16 @@ base::Version UpdaterState::GetGoogleUpdateVersion(bool is_machine) {
   return base::Version();
 }
 
-base::Time UpdaterState::GetGoogleUpdateLastStartedAU(bool is_machine) {
-  return GetGoogleUpdateTimeValue(is_machine, kRegValueLastStartedAU);
+base::Time UpdaterState::GetUpdaterLastStartedAU(bool is_machine) {
+  return GetUpdaterTimeValue(is_machine, kRegValueLastStartedAU);
 }
 
-base::Time UpdaterState::GetGoogleUpdateLastChecked(bool is_machine) {
-  return GetGoogleUpdateTimeValue(is_machine, kRegValueLastChecked);
+base::Time UpdaterState::GetUpdaterLastChecked(bool is_machine) {
+  return GetUpdaterTimeValue(is_machine, kRegValueLastChecked);
 }
 
-base::Time UpdaterState::GetGoogleUpdateTimeValue(bool is_machine,
-                                                  const wchar_t* value_name) {
+base::Time UpdaterState::GetUpdaterTimeValue(bool is_machine,
+                                             const wchar_t* value_name) {
   const HKEY root_key = is_machine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   base::win::RegKey update_key;
 
@@ -161,7 +106,7 @@ bool UpdaterState::IsAutoupdateCheckEnabled() {
 // Returns -1 if the policy is not found or the value was invalid. Otherwise,
 // returns a value in the [0, 3] range, representing the value of the
 // Chrome update group policy.
-int UpdaterState::GetChromeUpdatePolicy() {
+int UpdaterState::GetUpdatePolicy() {
   const int kMaxUpdatePolicyValue = 3;
 
   base::win::RegKey policy_key;
@@ -192,4 +137,4 @@ bool UpdaterState::IsJoinedToDomain() {
   return base::win::IsEnrolledToDomain();
 }
 
-}  // namespace component_updater
+}  // namespace update_client