Move user cloud policy to BrowserProcess.

chrome/browser/policy/profile_policy_connector.h

Index: chrome/browser/policy/profile_policy_connector.h
diff --git a/chrome/browser/policy/profile_policy_connector.h b/chrome/browser/policy/profile_policy_connector.h
deleted file mode 100644
index 4fc572b113efdf278a41258c0d8e080787e781c2..0000000000000000000000000000000000000000
--- a/chrome/browser/policy/profile_policy_connector.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_
-#define CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_
-#pragma once
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/observer_list.h"
-#include "chrome/browser/policy/configuration_policy_provider.h"
-#include "chrome/browser/profiles/profile_keyed_service.h"
-
-class Profile;
-
-namespace policy {
-
-class CloudPolicySubsystem;
-class UserPolicyIdentityStrategy;
-
-// This class is a container for the profile-specific policy bits located in the
-// profile. Since the subsystem owns the policy provider, it's vital that it
-// gets initialized before the profile's prefs and destroyed after the prefs
-// are gone.
-class ProfilePolicyConnector : public ProfileKeyedService {
- public:
-  explicit ProfilePolicyConnector(Profile* profile);
-  virtual ~ProfilePolicyConnector();
-
-  // Schedules initialization of the policy backend service if the service is
-  // already constructed.
-  void ScheduleServiceInitialization(int64 delay_milliseconds);
-
-  // Initializes the context. Should be called only after the profile's request
-  // context is up.
-  void Initialize();
-
-  // Shuts the context down. This must be called before the networking
-  // infrastructure in the profile goes away.
-  //
-  // TODO(jknotten): this will be called by ProfileDependencyManager --
-  // ensure that it is dependent on the right services. See comment
-  // in ProfilePolicyConnectorFactory::ProfilePolicyConnectorFactory.
-  virtual void Shutdown() OVERRIDE;
-
-  ConfigurationPolicyProvider* GetManagedCloudProvider();
-  ConfigurationPolicyProvider* GetRecommendedCloudProvider();
-
- private:
-  Profile* profile_;
-
-  scoped_ptr<UserPolicyIdentityStrategy> identity_strategy_;
-  scoped_ptr<CloudPolicySubsystem> cloud_policy_subsystem_;
-
-  scoped_ptr<ConfigurationPolicyProvider> managed_cloud_provider_;
-  scoped_ptr<ConfigurationPolicyProvider> recommended_cloud_provider_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProfilePolicyConnector);
-};
-
-// A wrapper for the ProfilePolicyConnector's cloud providers.
-//
-// Some well-known policies that are not provided by the
-// |profile_policy_provider_| are instead provided by the
-// |browser_policy_provider_|, thus merging device policies into
-// profile policies.
-//
-// Currently used to pass the device proxy settings into the profile
-// preferences.
-class MergingPolicyProvider: public ConfigurationPolicyProvider,
-                             public ConfigurationPolicyProvider::Observer {
- public:
-  MergingPolicyProvider(ConfigurationPolicyProvider* browser_policy_provider,
-                        ConfigurationPolicyProvider* profile_policy_provider);
-  virtual ~MergingPolicyProvider();
-
-  // ConfigurationPolicyProvider methods:
-  virtual bool Provide(ConfigurationPolicyStoreInterface* store) OVERRIDE;
-  virtual void AddObserver(
-      ConfigurationPolicyProvider::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(
-      ConfigurationPolicyProvider::Observer* observer) OVERRIDE;
-
-  // ConfigurationPolicyProvider::Observer methods:
-  virtual void OnUpdatePolicy() OVERRIDE;
-  virtual void OnProviderGoingAway() OVERRIDE;
-
- private:
-  ConfigurationPolicyProvider* browser_policy_provider_;
-  ConfigurationPolicyProvider* profile_policy_provider_;
-  scoped_ptr<ConfigurationPolicyObserverRegistrar> browser_registrar_;
-  scoped_ptr<ConfigurationPolicyObserverRegistrar> profile_registrar_;
-  ObserverList<ConfigurationPolicyProvider::Observer, true> observer_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(MergingPolicyProvider);
-};
-
-
-}  // namespace policy
-
-#endif  // CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_H_

[Joao da Silva, 2011/06/03 12:23:51]

Yay, it's gone! :-)