Removing FakePolicyWatcher and introducing FakeAsyncPolicyLoader.

components/policy/core/common/fake_async_policy_loader.h

Index: components/policy/core/common/fake_async_policy_loader.h
diff --git a/components/policy/core/common/fake_async_policy_loader.h b/components/policy/core/common/fake_async_policy_loader.h
new file mode 100644
index 0000000000000000000000000000000000000000..886c0461b117011b37bb763061dcf3dba0b762a4
--- /dev/null
+++ b/components/policy/core/common/fake_async_policy_loader.h
@@ -0,0 +1,55 @@
+// Copyright 2015 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.
+
+#ifndef COMPONENTS_POLICY_CORE_COMMON_FAKE_ASYNC_POLICY_LOADER_H_
+#define COMPONENTS_POLICY_CORE_COMMON_FAKE_ASYNC_POLICY_LOADER_H_
+
+#include "base/values.h"

[Mattias Nissler (ping if slow), 2015/01/22 16:05:07]

nit: you can forward-declare DictionaryValue instead.

[Łukasz Anforowicz, 2015/01/22 18:28:05]

Done.

+#include "components/policy/core/common/async_policy_loader.h"
+#include "components/policy/core/common/policy_bundle.h"
+#include "components/policy/core/common/policy_namespace.h"
+#include "components/policy/core/common/policy_types.h"
+
+namespace policy {
+
+// Fake AsyncPolicyLoader for testing with test-controlled policies.
+//
+// Typical test code would populate the policy contents via calls to
+// ClearPolicies and AddPolicies and then notify the rest of the policy
+// subsystem of the changes by calling PostReloadOnBackgroundThread.
+class FakeAsyncPolicyLoader : public AsyncPolicyLoader {
+ public:
+  explicit FakeAsyncPolicyLoader(
+      scoped_refptr<base::SequencedTaskRunner> task_runner);
+
+  // Implementation of virtual methods from AsyncPolicyLoader base class.
+  scoped_ptr<PolicyBundle> Load() override;
+  void InitOnBackgroundThread() override;
+
+  // Clears the simulated / faked policy contents.
+  void ClearPolicies();

[Mattias Nissler (ping if slow), 2015/01/22 16:05:07]

I'd prefer if you just made an UpdatePolicies(const PolicyBundle& bundle) call
instead ClearPolicies() and AddPolicies(). That's more useful in general and
PolicyBundle is the canonical format to pass policy settings around. Code that
needs to use a DictionaryValue for a good reason to describe policies can still
do so by doing something similar to your current implementation of AddPolicies.

[Łukasz Anforowicz, 2015/01/22 18:28:05]

I removed ClearPolicies and AddPolicies(Dict) and replaced them with
SetPolicies(const PolicyBundle&).  I left PostReloadOnBackgroundThread
untouched.  I hope this is what you meant (not sure if you also wanted to roll
PostReload... into UpdatePolicies;  I think leaving them separate is fine and
more versatile).

+
+  // Adds content to the simulated / faked policy contents.
+  void AddPolicies(const PolicyNamespace& ns,
+                   const base::DictionaryValue& policies,
+                   PolicyLevel level,
+                   PolicyScope scope);
+
+  // Notifies the rest of the policy subsystem that policy contents have
+  // changed.  This simulates / fakes a notification that normally would be
+  // triggered by a FilePathWatcher or (registry)ObjectWatcher in a real loader.
+  //
+  // See AsyncPolicyLoader::Reload method for description of the |force|
+  // parameter.
+  void PostReloadOnBackgroundThread(bool force);
+
+ private:
+  PolicyBundle policy_bundle_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeAsyncPolicyLoader);
+};
+
+}  // namespace policy
+
+#endif  // COMPONENTS_POLICY_CORE_COMMON_FAKE_ASYNC_POLICY_LOADER_H_