Support cloud policy for extensions on the desktop platforms.

chrome/browser/policy/cloud/component_cloud_policy_service.h

Index: chrome/browser/policy/cloud/component_cloud_policy_service.h
diff --git a/chrome/browser/policy/cloud/component_cloud_policy_service.h b/chrome/browser/policy/cloud/component_cloud_policy_service.h
index a0dcbe2748896854579a373e692b771a40d7443e..e997da63c9ea456d243b4c25413d597c707d7537 100644
--- a/chrome/browser/policy/cloud/component_cloud_policy_service.h
+++ b/chrome/browser/policy/cloud/component_cloud_policy_service.h
@@ -74,7 +74,9 @@ class ComponentCloudPolicyService : public CloudPolicyClient::Observer,
       Delegate* delegate,
       SchemaRegistry* schema_registry,
       CloudPolicyCore* core,
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
       scoped_ptr<ResourceCache> cache,
+#endif
       scoped_refptr<net::URLRequestContextGetter> request_context,
       scoped_refptr<base::SequencedTaskRunner> backend_task_runner,
       scoped_refptr<base::SequencedTaskRunner> io_task_runner);
@@ -109,6 +111,9 @@ class ComponentCloudPolicyService : public CloudPolicyClient::Observer,
   virtual void OnClientError(CloudPolicyClient* client) OVERRIDE;
 
  private:
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)

[bartfab (slow), 2013/11/25 15:05:50]

Nit: We do not tend to have blank lines around #ifs.

[Joao da Silva, 2013/11/25 16:44:11]

Done.

+
   class Backend;
 
   void InitializeIfReady();
@@ -142,9 +147,16 @@ class ComponentCloudPolicyService : public CloudPolicyClient::Observer,
   // available.
   scoped_refptr<SchemaMap> current_schema_map_;
 
+#endif  // !defined(OS_ANDROID) && !defined(OS_IOS)

[bartfab (slow), 2013/11/25 15:05:50]

Nit: We do not tend to have blank lines before #endifs.

[Joao da Silva, 2013/11/25 16:44:11]

Done.

+
   // Contains all the current policies for components.
   PolicyBundle policy_;
 
+  // Whether the backend has started initializing asynchronously. Used to
+  // prevent double initialization, since both OnSchemaRegistryUpdated() and
+  // OnStoreLoaded() can happen while the backend is initializing.
+  bool started_loading_initial_policy_;
+
   // Whether the backend has been initialized with the initial credentials and
   // schemas, and this provider is serving the initial policies loaded from the
   // cache.