Move user cloud policy to BrowserProcess.

chrome/test/testing_browser_process.h

 // 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.
 
 // An implementation of BrowserProcess for unit tests that fails for most
 // services. By preventing creation of services, we reduce dependencies and
 // keep the profile clean. Clients of this class must handle the NULL return
 // value, however.
 
 #ifndef CHROME_TEST_TESTING_BROWSER_PROCESS_H_
@@ skipping 12 matching lines @@
 class NotificationUIManager;
 class PrefService;
 class WatchDogThread;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace policy {
 class BrowserPolicyConnector;
+class UserPolicyConnector;
+class ConfigurationPolicyProvider;
 }
 
 namespace ui {
 class Clipboard;
 }
 
 class TestingBrowserProcess : public BrowserProcess {
  public:
   TestingBrowserProcess();
   virtual ~TestingBrowserProcess();
@@ skipping 23 matching lines @@
 #if defined(OS_CHROMEOS)
   virtual base::Thread* web_socket_proxy_thread();
 #endif
 
   virtual ProfileManager* profile_manager();
 
   virtual PrefService* local_state();
 
   virtual policy::BrowserPolicyConnector* browser_policy_connector();
 
+  virtual policy::UserPolicyConnector* user_policy_connector();
+
+  virtual policy::ConfigurationPolicyProvider* managed_cloud_policy_provider();
+
+  virtual policy::ConfigurationPolicyProvider*
+  recommended_cloud_policy_provider();
+
   virtual IconManager* icon_manager();
 
   virtual ThumbnailGenerator* GetThumbnailGenerator();
 
   virtual DevToolsManager* devtools_manager();
 
   virtual SidebarManager* sidebar_manager();
 
   virtual TabCloseableStateWatcher* tab_closeable_state_watcher();
 
@@ skipping 68 matching lines @@
  private:
   NotificationService notification_service_;
   scoped_ptr<base::WaitableEvent> shutdown_event_;
   unsigned int module_ref_count_;
   scoped_ptr<ui::Clipboard> clipboard_;
   std::string app_locale_;
 
   // Weak pointer.
   PrefService* local_state_;
   scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_;
+  scoped_ptr<policy::UserPolicyConnector> user_policy_connector_;
+  scoped_ptr<policy::ConfigurationPolicyProvider>
+  managed_cloud_policy_provider_;

[Joao da Silva, 2011/05/31 14:50:23]

Nit: indent?

[sfeuz, 2011/06/03 08:30:35]

Obsolete.

+  scoped_ptr<policy::ConfigurationPolicyProvider>
+  recommended_cloud_policy_provider_;
   scoped_ptr<GoogleURLTracker> google_url_tracker_;
   scoped_ptr<ProfileManager> profile_manager_;
   scoped_ptr<NotificationUIManager> notification_ui_manager_;
   scoped_ptr<printing::BackgroundPrintingManager> background_printing_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);
 };
 
 // Scoper to put a TestingBrowserProcess in |g_browser_process|.
 class ScopedTestingBrowserProcess {
  public:
   ScopedTestingBrowserProcess();
   ~ScopedTestingBrowserProcess();
 
   TestingBrowserProcess* get() {
     return browser_process_.get();
   }
 
  private:
   // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   // After the transition is over, we should just stack-allocate it.
   scoped_ptr<TestingBrowserProcess> browser_process_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTestingBrowserProcess);
 };
 
 #endif  // CHROME_TEST_TESTING_BROWSER_PROCESS_H_