Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/cloud_policy_data_store.cc

Index: chrome/browser/policy/cloud_policy_data_store.cc
diff --git a/chrome/browser/policy/cloud_policy_data_store.cc b/chrome/browser/policy/cloud_policy_data_store.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e362f0eb9274881e4624ea1e72711ed40ede3914
--- /dev/null
+++ b/chrome/browser/policy/cloud_policy_data_store.cc
@@ -0,0 +1,183 @@
+// Copyright (c) 2011 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/policy/cloud_policy_data_store.h"
+
+#include "base/compiler_specific.h"
+#include "base/string_util.h"

[Joao da Silva, 2011/07/07 16:54:16]

Nit: string_util.h not used

[gfeher, 2011/07/08 09:19:14]

Done.

+#include "chrome/browser/policy/proto/device_management_backend.pb.h"
+#include "chrome/browser/policy/proto/device_management_constants.h"
+
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/login/ownership_service.h"
+#include "chrome/browser/chromeos/login/user_manager.h"

[Joao da Silva, 2011/07/07 16:54:16]

Nit: cros_library.h, ownership_service.h and user_manager.h not used

[gfeher, 2011/07/08 09:19:14]

Done.

+#include "chrome/browser/chromeos/system_access.h"
+#endif
+
+namespace {
+
+// MachineInfo key names.
+static const char kMachineInfoSystemHwqual[] = "hardware_class";

[Joao da Silva, 2011/07/07 16:54:16]

Is static needed inside the anonymous namespace?

[gfeher, 2011/07/08 09:19:14]

Done.

+static const char kMachineInfoSerialNumber[] = "serial_number";
+
+}  // namespace
+
+namespace policy {
+
+namespace em = enterprise_management;

[Joao da Silva, 2011/07/07 16:54:16]

This is already defined in the .h. Actually, is it OK to define it in the .h?

[gfeher, 2011/07/08 09:19:14]

It's done in other .h files as well. I guess the only problem is that files
including the .h file also get this definition, even if they don't need it. I
tried to move it to an anonymous namespace but then it conflicted with "em"
definitions from other .h files. So I leave it there for now, and I am not sure
if there's a better solution.

+
+// static
+CloudPolicyDataStore* CloudPolicyDataStore::CreateForUserPolicies() {
+  return new CloudPolicyDataStore(em::DeviceRegisterRequest::USER,
+                                  kChromeUserPolicyType,
+                                  "", "");
+}
+
+// static
+CloudPolicyDataStore* CloudPolicyDataStore::CreateForDevicePolicies() {
+  std::string machine_model;
+  std::string machine_id;
+#if defined(OS_CHROMEOS)
+  chromeos::SystemAccess* sys_lib = chromeos::SystemAccess::GetInstance();
+  if (!sys_lib->GetMachineStatistic(kMachineInfoSystemHwqual,
+                                    &machine_model)) {
+    LOG(ERROR) << "Failed to get machine model.";
+  }
+  if (!sys_lib->GetMachineStatistic(kMachineInfoSerialNumber,
+                                    &machine_id)) {
+    LOG(ERROR) << "Failed to get machine serial number.";
+  }
+#endif
+  return new CloudPolicyDataStore(em::DeviceRegisterRequest::DEVICE,
+                             kChromeDevicePolicyType,
+                             machine_model,
+                             machine_id);
+}
+
+CloudPolicyDataStore::CloudPolicyDataStore(
+    const em::DeviceRegisterRequest_Type policy_register_type,
+    const std::string& policy_type,
+    const std::string& machine_model,
+    const std::string& machine_id)
+    : policy_register_type_(policy_register_type),
+      policy_type_(policy_type),
+      machine_model_(machine_model),
+      machine_id_(machine_id),
+      token_cache_loaded_(false),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {}
+
+CloudPolicyDataStore::~CloudPolicyDataStore() {
+  FOR_EACH_OBSERVER(Observer, observer_list_, OnDataStoreGoingAway());
+}
+
+base::WeakPtr<CloudPolicyDataStore> CloudPolicyDataStore::GetWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
+void CloudPolicyDataStore::SetDeviceToken(const std::string& device_token,
+                                          bool from_cache) {
+  DCHECK(token_cache_loaded_ != from_cache);
+  if (!token_cache_loaded_) {
+    // The cache should be the first to set the token. (It may be "")
+    DCHECK(from_cache);
+    token_cache_loaded_ = true;
+  } else {
+    // The cache should never set the token later.
+    DCHECK(!from_cache);
+  }
+  device_token_ = device_token;
+  token_cache_loaded_ = true;
+  NotifyDeviceTokenChanged();
+}
+
+void CloudPolicyDataStore::SetGaiaToken(const std::string& gaia_token) {
+  DCHECK(!user_name_.empty());
+  gaia_token_ = gaia_token;
+  NotifyCredentialsChanged();
+}
+
+void CloudPolicyDataStore::Reset() {
+  user_name_ = "";
+  gaia_token_ = "";
+  device_id_ = "";
+  device_token_ = "";
+}
+
+void CloudPolicyDataStore::SetupForTesting(const std::string& device_token,
+                                           const std::string& device_id,
+                                           const std::string& user_name,
+                                           const std::string& gaia_token,
+                                           bool token_cache_loaded) {
+  device_id_ = device_id;
+  user_name_ = user_name;
+  gaia_token_ = gaia_token;
+  device_token_ = device_token;
+  token_cache_loaded_ = token_cache_loaded;
+}
+
+void CloudPolicyDataStore::set_device_id(const std::string& device_id) {
+  device_id_ = device_id;
+}
+
+std::string CloudPolicyDataStore::device_id() const {
+  return device_id_;
+}
+
+void CloudPolicyDataStore::set_user_name(const std::string& user_name) {
+  user_name_ = user_name;
+}
+
+std::string CloudPolicyDataStore::device_token() const {
+  return device_token_;
+}
+
+std::string CloudPolicyDataStore::gaia_token() const {
+  return gaia_token_;
+}
+
+std::string CloudPolicyDataStore::machine_id() const {
+  return machine_id_;
+}
+
+std::string CloudPolicyDataStore::machine_model() const {
+  return machine_model_;
+}
+
+em::DeviceRegisterRequest_Type
+CloudPolicyDataStore::policy_register_type() const {
+  return policy_register_type_;
+}
+
+std::string CloudPolicyDataStore::policy_type() const {
+  return policy_type_;
+}
+
+bool CloudPolicyDataStore::token_cache_loaded() const {
+  return token_cache_loaded_;
+}
+
+std::string CloudPolicyDataStore::user_name() const {
+  return user_name_;
+}
+
+void CloudPolicyDataStore::AddObserver(
+    CloudPolicyDataStore::Observer* observer) {
+  observer_list_.AddObserver(observer);
+}
+
+void CloudPolicyDataStore::RemoveObserver(
+    CloudPolicyDataStore::Observer* observer) {
+  observer_list_.RemoveObserver(observer);
+}
+
+void CloudPolicyDataStore::NotifyCredentialsChanged() {
+  FOR_EACH_OBSERVER(Observer, observer_list_, OnCredentialsChanged());
+}
+
+void CloudPolicyDataStore::NotifyDeviceTokenChanged() {
+  FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceTokenChanged());
+}
+
+}  // namespace policy