Removing FakePolicyWatcher and introducing FakeAsyncPolicyLoader.

remoting/host/policy_hack/policy_service_watcher.cc

 // Copyright 2014 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 "remoting/host/policy_hack/policy_service_watcher.h"
+
 #include "base/files/file_path.h"
 #include "base/single_thread_task_runner.h"
 #include "components/policy/core/common/async_policy_loader.h"
 #include "components/policy/core/common/async_policy_provider.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_service.h"

[Mattias Nissler (ping if slow), 2015/01/23 08:27:40]

already in header

[Łukasz Anforowicz, 2015/01/23 17:49:55]

Done.

 #include "components/policy/core/common/policy_service_impl.h"
 #include "components/policy/core/common/schema.h"
 #include "components/policy/core/common/schema_registry.h"
 #include "policy/policy_constants.h"
-#include "remoting/host/policy_hack/policy_watcher.h"
 
 #if defined(OS_CHROMEOS)
 #include "content/public/browser/browser_thread.h"
 #elif defined(OS_WIN)
 #include "components/policy/core/common/policy_loader_win.h"
 #elif defined(OS_MACOSX)
 #include "components/policy/core/common/policy_loader_mac.h"
 #include "components/policy/core/common/preferences_mac.h"
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
 #include "components/policy/core/common/config_dir_policy_loader.h"
 #endif
 
 using namespace policy;
 
 namespace remoting {
 namespace policy_hack {
 
 namespace {
 
-// TODO(lukasza): Merge PolicyServiceWatcher with PolicyWatcher class
-// (after removing other classes derived from PolicyWatcher - i.e. after
-// removing FakePolicyWatcher class and replacing it with mocks of classes
-// from components/policy instead).
-
-// PolicyServiceWatcher is a concrete implementation of PolicyWatcher that wraps
-// an instance of PolicyService.
-class PolicyServiceWatcher : public PolicyWatcher,
-                             public PolicyService::Observer {
- public:
-  // Constructor for the case when |policy_service| is borrowed.
-  //
-  // |policy_service_task_runner| is the task runner where it is safe
-  // to call |policy_service| methods and where we expect to get callbacks
-  // from |policy_service|.
-  PolicyServiceWatcher(const scoped_refptr<base::SingleThreadTaskRunner>&
-                           policy_service_task_runner,
-                       PolicyService* policy_service);
-
-  // Constructor for the case when |policy_service| is owned (and uses also
-  // owned |owned_policy_provider| and |owned_schema_registry|.
-  //
-  // |policy_service_task_runner| is the task runner where it is safe
-  // to call |policy_service| methods and where we expect to get callbacks
-  // from |policy_service|.
-  PolicyServiceWatcher(
-      const scoped_refptr<base::SingleThreadTaskRunner>&
-          policy_service_task_runner,
-      scoped_ptr<PolicyService> owned_policy_service,
-      scoped_ptr<ConfigurationPolicyProvider> owned_policy_provider,
-      scoped_ptr<SchemaRegistry> owned_schema_registry);
-
-  ~PolicyServiceWatcher() override;
-
-  // PolicyService::Observer interface.
-  void OnPolicyUpdated(const PolicyNamespace& ns,
-                       const PolicyMap& previous,
-                       const PolicyMap& current) override;
-  void OnPolicyServiceInitialized(PolicyDomain domain) override;
-
- protected:
-  // PolicyWatcher overrides.
-  void StartWatchingInternal() override;
-  void StopWatchingInternal() override;
-
- private:
-  PolicyService* policy_service_;
-
-  // Order of fields below is important to ensure destruction takes object
-  // dependencies into account:
-  // - |owned_policy_service_| uses |owned_policy_provider_|
-  // - |owned_policy_provider_| uses |owned_schema_registry_|
-  scoped_ptr<SchemaRegistry> owned_schema_registry_;
-  scoped_ptr<ConfigurationPolicyProvider> owned_policy_provider_;
-  scoped_ptr<PolicyService> owned_policy_service_;
-
-  DISALLOW_COPY_AND_ASSIGN(PolicyServiceWatcher);
-};
-
 PolicyNamespace GetPolicyNamespace() {
   return PolicyNamespace(POLICY_DOMAIN_CHROME, std::string());
 }
 
+}  // namespace
+
 PolicyServiceWatcher::PolicyServiceWatcher(
     const scoped_refptr<base::SingleThreadTaskRunner>&
         policy_service_task_runner,
     PolicyService* policy_service)
     : PolicyWatcher(policy_service_task_runner) {
   policy_service_ = policy_service;
 }
 
 PolicyServiceWatcher::PolicyServiceWatcher(
     const scoped_refptr<base::SingleThreadTaskRunner>&
@@ skipping 39 matching lines @@
   // Process current policy state.
   if (policy_service_->IsInitializationComplete(POLICY_DOMAIN_CHROME)) {
     OnPolicyServiceInitialized(POLICY_DOMAIN_CHROME);
   }
 }
 
 void PolicyServiceWatcher::StopWatchingInternal() {
   policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, this);
 }
 
-#if !defined(OS_CHROMEOS)
-
-// Creates PolicyServiceWatcher that wraps the owned |async_policy_loader|
-// with an appropriate PolicySchema.
-//
-// |policy_service_task_runner| is passed through to the constructor
-// of PolicyServiceWatcher.
-scoped_ptr<PolicyServiceWatcher> CreateFromPolicyLoader(
+scoped_ptr<PolicyServiceWatcher> PolicyServiceWatcher::CreateFromPolicyLoader(
     const scoped_refptr<base::SingleThreadTaskRunner>&
         policy_service_task_runner,
     scoped_ptr<AsyncPolicyLoader> async_policy_loader) {
   // TODO(lukasza): Schema below should ideally only cover Chromoting-specific
   // policies (expecting perf and maintanability improvement, but no functional
   // impact).
   Schema schema = Schema::Wrap(GetChromeSchemaData());
 
   scoped_ptr<SchemaRegistry> schema_registry(new SchemaRegistry());
   schema_registry->RegisterComponent(GetPolicyNamespace(), schema);
 
   scoped_ptr<AsyncPolicyProvider> policy_provider(new AsyncPolicyProvider(
       schema_registry.get(), async_policy_loader.Pass()));
   policy_provider->Init(schema_registry.get());
 
   PolicyServiceImpl::Providers providers;
   providers.push_back(policy_provider.get());
   scoped_ptr<PolicyService> policy_service(new PolicyServiceImpl(providers));
 
   return make_scoped_ptr(new PolicyServiceWatcher(
       policy_service_task_runner, policy_service.Pass(), policy_provider.Pass(),
       schema_registry.Pass()));
 }
 
-#endif
-
-}  // anonymous namespace
-
 scoped_ptr<PolicyWatcher> PolicyWatcher::Create(
     policy::PolicyService* policy_service,
     const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner) {
 #if defined(OS_CHROMEOS)
   DCHECK(policy_service);
   return make_scoped_ptr(new PolicyServiceWatcher(
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::UI),
       policy_service));
 #elif defined(OS_WIN)
   DCHECK(!policy_service);
   static const wchar_t kRegistryKey[] = L"SOFTWARE\\Policies\\Google\\Chrome";
-  return CreateFromPolicyLoader(
+  return PolicyServiceWatcher::CreateFromPolicyLoader(
       network_task_runner,
       PolicyLoaderWin::Create(network_task_runner, kRegistryKey));
 #elif defined(OS_MACOSX)
   CFStringRef bundle_id = CFSTR("com.google.Chrome");
   DCHECK(!policy_service);
-  return CreateFromPolicyLoader(
+  return PolicyServiceWatcher::CreateFromPolicyLoader(
       network_task_runner,
       make_scoped_ptr(new PolicyLoaderMac(
           network_task_runner,
           policy::PolicyLoaderMac::GetManagedPolicyPath(bundle_id),
           new MacPreferences(), bundle_id)));
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
   DCHECK(!policy_service);
   // Always read the Chrome policies (even on Chromium) so that policy
   // enforcement can't be bypassed by running Chromium.
   static const base::FilePath::CharType kPolicyDir[] =
       FILE_PATH_LITERAL("/etc/opt/chrome/policies");
-  return CreateFromPolicyLoader(
+  return PolicyServiceWatcher::CreateFromPolicyLoader(
       network_task_runner, make_scoped_ptr(new ConfigDirPolicyLoader(
                                network_task_runner, base::FilePath(kPolicyDir),
                                POLICY_SCOPE_MACHINE)));
 #else
 #error OS that is not yet supported by PolicyWatcher code.
 #endif
 }
 
 }  // namespace policy_hack
 }  // namespace remoting