Add a header when fetching pages under the DMServer URL.

chrome/browser/policy/cloud/policy_header_service_factory.cc

+// Copyright (c) 2013 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_header_service_factory.h"
+
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/policy/cloud/policy_header_service.h"
+#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
+#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
+#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
+#include "components/policy/core/common/cloud/cloud_policy_store.h"
+#include "components/policy/core/common/cloud/device_management_service.h"
+
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
+#endif
+
+namespace policy {
+
+class PolicyHeaderServiceWrapper : public BrowserContextKeyedService {

[Joao da Silva, 2013/12/09 14:46:21]

Put this in an anonymous namespace.

A wrapper like this works; another possibility is to inhering from both BCKS and
PolicyHeaderService. You'd have to forwards the Shutdown() call to the
PolicyHeaderService though.

[Andrew T Wilson (Slow), 2013/12/10 07:15:56]

Done. Good catch.
Yeah, "favor composition over inheritance" seems to dictate that my current impl
is better. Especially since PolicyHeaderService doesn't have a Shutdown() method
(it does its cleanup in the destructor).

+ public:
+  explicit PolicyHeaderServiceWrapper(scoped_ptr<PolicyHeaderService> service)
+      : policy_header_service_(service.Pass()) {}
+
+  PolicyHeaderService* policy_header_service() const {
+    return policy_header_service_.get();
+  }
+
+  virtual void Shutdown() OVERRIDE {
+    // Shutdown our core object so it can unregister any observers before the
+    // services we depend on are shutdown.
+    policy_header_service_.reset();
+  }
+
+ private:
+  scoped_ptr<PolicyHeaderService> policy_header_service_;

[Joao da Silva, 2013/12/09 14:46:21]

#include scoped_ptr.h

[Andrew T Wilson (Slow), 2013/12/10 07:15:56]

Done.

+};
+
+PolicyHeaderServiceFactory::PolicyHeaderServiceFactory()
+    : BrowserContextKeyedServiceFactory(
+        "PolicyHeaderServiceFactory",
+        BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(UserCloudPolicyManagerFactory::GetInstance());

[Joao da Silva, 2013/12/09 14:46:21]

On ChromeOS this should be UserCloudPolicyManagerFactoryChromeOS

[Andrew T Wilson (Slow), 2013/12/10 07:15:56]

Hmm, that seems like an API wart. But done (plus sent an email about this - we
should really change this API).

+}
+
+PolicyHeaderServiceFactory::~PolicyHeaderServiceFactory() {
+}
+
+// static
+PolicyHeaderService* PolicyHeaderServiceFactory::GetForBrowserContext(
+    content::BrowserContext* context) {
+  PolicyHeaderServiceWrapper* wrapper =
+      static_cast<PolicyHeaderServiceWrapper*>(
+          GetInstance()->GetServiceForBrowserContext(context, true));

[Joao da Silva, 2013/12/09 14:46:21]

|wrapper| will be NULL for incognito profiles. I think a NULL check is a good
idea though this isn't called for those profiles. WDYT?

[Andrew T Wilson (Slow), 2013/12/10 07:15:56]

Done.

+  return wrapper->policy_header_service();
+}
+
+BrowserContextKeyedService*
+PolicyHeaderServiceFactory::BuildServiceInstanceFor(
+    content::BrowserContext* context) const {
+  BrowserPolicyConnector* connector =
+      g_browser_process->browser_policy_connector();
+  DeviceManagementService* device_management_service =
+      connector->device_management_service();
+  UserCloudPolicyManager* manager =
+      UserCloudPolicyManagerFactory::GetForBrowserContext(context);

[Joao da Silva, 2013/12/09 14:46:21]

This needs an OS_CHROMEOS version

[Andrew T Wilson (Slow), 2013/12/10 07:15:56]

Done.

+  CloudPolicyStore* user_store = manager->core()->store();
+  CloudPolicyStore* device_store = NULL;
+#if defined(OS_CHROMEOS)
+  device_store = connector->GetDeviceCloudPolicyManager()->core()->store();
+#endif
+
+  scoped_ptr<PolicyHeaderService> service = make_scoped_ptr(
+      new PolicyHeaderService(
+          device_management_service->GetServerUrl(), user_store, device_store));
+      return new PolicyHeaderServiceWrapper(service.Pass());

[Joao da Silva, 2013/12/09 14:46:21]

indentation

[Andrew T Wilson (Slow), 2013/12/10 07:15:56]

Done.

+}
+
+// static
+PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() {
+  return Singleton<PolicyHeaderServiceFactory>::get();
+}
+
+}  // namespace policy