Add support for Omaha cohorts to the component updater.

components/update_client/persisted_data.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 "components/update_client/persisted_data.h"
 
 #include <string>
 #include <vector>
 
 #include "base/guid.h"
@@ skipping 10 matching lines @@
 
 namespace update_client {
 
 PersistedData::PersistedData(PrefService* pref_service)
     : pref_service_(pref_service) {}
 
 PersistedData::~PersistedData() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-int PersistedData::GetDateLastRollCall(const std::string& id) const {
+int PersistedData::GetInt(const std::string& id,
+                          const std::string& key,
+                          int fallback) const {
   DCHECK(thread_checker_.CalledOnValidThread());
+  // We assume ids do not contain '.' characters.
+  DCHECK_EQ(std::string::npos, id.find('.'));
   if (!pref_service_)
-    return kDateLastRollCallUnknown;
-  int dlrc = kDateLastRollCallUnknown;
+    return fallback;
+  int result = fallback;

[Sorin Jianu, 2016/08/22 19:59:33]

we could move the declaration closer to where the variable is used.

[waffles, 2016/08/22 23:40:32]

Done.

   const base::DictionaryValue* dict =
       pref_service_->GetDictionary(kPersistedDataPreference);
+  if (!dict)
+    return fallback;
+  if (!dict->GetInteger(
+          base::StringPrintf("apps.%s.%s", id.c_str(), key.c_str()), &result))
+    return fallback;
+  return result;

[Sorin Jianu, 2016/08/22 19:59:33]

Do you like this rewrite?

  int PersistedData::GetInt(const std::string& id,
                            const std::string& key,
                            int fallback) const {
    DCHECK(thread_checker_.CalledOnValidThread());
    // We assume ids do not contain '.' characters.
    DCHECK_EQ(std::string::npos, id.find('.'));
    if (!pref_service_)
      return fallback;
    const base::DictionaryValue* dict =
        pref_service_->GetDictionary(kPersistedDataPreference);
    if (!dict)
      return fallback;
    int result(0);
    return dict->GetInteger(
            base::StringPrintf("apps.%s.%s", id.c_str(), key.c_str()), &result)
? result : fallback;
  }

[waffles, 2016/08/22 23:40:32]

Done.

+}
+
+std::string PersistedData::GetString(const std::string& id,
+                                     const std::string& key) const {
+  DCHECK(thread_checker_.CalledOnValidThread());
   // We assume ids do not contain '.' characters.
   DCHECK_EQ(std::string::npos, id.find('.'));
-  if (!dict->GetInteger(base::StringPrintf("apps.%s.dlrc", id.c_str()), &dlrc))
-    return kDateLastRollCallUnknown;
-  return dlrc;
+  if (!pref_service_)
+    return std::string();
+  std::string result;

[Sorin Jianu, 2016/08/22 19:59:33]

same as above.

[waffles, 2016/08/22 23:40:32]

Done.

+  const base::DictionaryValue* dict =
+      pref_service_->GetDictionary(kPersistedDataPreference);
+  if (!dict)
+    return std::string();
+  if (!dict->GetString(
+          base::StringPrintf("apps.%s.%s", id.c_str(), key.c_str()), &result))
+    return std::string();
+  return result;
+}
+
+int PersistedData::GetDateLastRollCall(const std::string& id) const {
+  return GetInt(id, "dlrc", kDateLastRollCallUnknown);
 }
 
 std::string PersistedData::GetPingFreshness(const std::string& id) const {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (!pref_service_)
-    return std::string();
-  std::string freshness;
-  const base::DictionaryValue* dict =
-      pref_service_->GetDictionary(kPersistedDataPreference);
-  // We assume ids do not contain '.' characters.
-  DCHECK_EQ(std::string::npos, id.find('.'));
-  if (!dict->GetString(base::StringPrintf("apps.%s.pf", id.c_str()),
-                       &freshness))
-    return std::string();
-  return base::StringPrintf("{%s}", freshness.c_str());
+  std::string result = GetString(id, "pf");
+  if (!result.empty()) {

[Sorin Jianu, 2016/08/22 19:59:33]

{} not needed or we could use ?; 

[waffles, 2016/08/22 23:40:32]

Done.

+    return base::StringPrintf("{%s}", result.c_str());
+  }
+  return result;
+}
+
+std::string PersistedData::GetCohort(const std::string& id) const {
+  return GetString(id, "cohort");
+}
+
+std::string PersistedData::GetCohortName(const std::string& id) const {
+  return GetString(id, "cohortname");
+}
+
+std::string PersistedData::GetCohortHint(const std::string& id) const {
+  return GetString(id, "cohorthint");
 }
 
 void PersistedData::SetDateLastRollCall(const std::vector<std::string>& ids,
                                         int datenum) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!pref_service_ || datenum < 0)
     return;
   DictionaryPrefUpdate update(pref_service_, kPersistedDataPreference);
   for (auto id : ids) {
     // We assume ids do not contain '.' characters.
     DCHECK_EQ(std::string::npos, id.find('.'));
     update->SetInteger(base::StringPrintf("apps.%s.dlrc", id.c_str()), datenum);
     update->SetString(base::StringPrintf("apps.%s.pf", id.c_str()),
                       base::GenerateGUID());
   }
 }
 
+void PersistedData::SetString(const std::string& id,
+                              const std::string& key,
+                              const std::string& value) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (!pref_service_)
+    return;
+  DictionaryPrefUpdate update(pref_service_, kPersistedDataPreference);
+  update->SetString(base::StringPrintf("apps.%s.%s", id.c_str(), key.c_str()),
+                    value);
+}
+
+void PersistedData::SetCohort(const std::string& id,
+                              const std::string& cohort) {
+  SetString(id, "cohort", cohort);
+}
+
+void PersistedData::SetCohortName(const std::string& id,
+                                  const std::string& cohort_name) {
+  SetString(id, "cohortname", cohort_name);
+}
+
+void PersistedData::SetCohortHint(const std::string& id,
+                                  const std::string& cohort_hint) {
+  SetString(id, "cohorthint", cohort_hint);
+}
+
 void PersistedData::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(kPersistedDataPreference);
 }
 
 }  // namespace update_client