Added RefreshPolicies to PolicyService.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2012 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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 132 matching lines @@
 #include "net/cookies/cookie_store.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
-#include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/policy/policy_service.h"
 #include "policy/policy_constants.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mach_ipc_mac.h"
 #endif
@@ skipping 15 matching lines @@
 using content::NavigationEntry;
 using content::PluginService;
 using content::OpenURLParams;
 using content::Referrer;
 using content::RenderViewHost;
 using content::SSLStatus;
 using content::WebContents;
 
 namespace {
 
+// Helper to reply asynchronously if |automation| is still valid.
+void SendSuccessReply(base::WeakPtr<AutomationProvider> automation,
+                      IPC::Message* reply_message) {
+  if (automation)
+    AutomationJSONReply(automation.get(), reply_message).SendSuccess(NULL);
+}
+
+// Helper to resolve the overloading of PostTask.
+void PostTask(BrowserThread::ID id, const base::Closure& callback) {
+  BrowserThread::PostTask(id, FROM_HERE, callback);
+}
+
 void SendMouseClick(int flags) {
   ui_controls::MouseButton button = ui_controls::LEFT;
   if ((flags & ui::EF_LEFT_MOUSE_BUTTON) ==
       ui::EF_LEFT_MOUSE_BUTTON) {
     button = ui_controls::LEFT;
   } else if ((flags & ui::EF_RIGHT_MOUSE_BUTTON) ==
              ui::EF_RIGHT_MOUSE_BUTTON) {
     button = ui_controls::RIGHT;
   } else if ((flags & ui::EF_MIDDLE_MOUSE_BUTTON) ==
              ui::EF_MIDDLE_MOUSE_BUTTON) {
@@ skipping 3541 matching lines @@
     return;
   }
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
   if (!plugin_prefs->CanEnablePlugin(true, FilePath(path))) {
     AutomationJSONReply(this, reply_message).SendError(
         StringPrintf("Could not enable plugin for path %s.", path.c_str()));
     return;
   }
   plugin_prefs->EnablePlugin(
       true, FilePath(path),
-      base::Bind(&TestingAutomationProvider::SendSuccessReply, this,
-                 reply_message));
+      base::Bind(SendSuccessReply, AsWeakPtr(), reply_message));
 }
 
 // Sample json input:
 //    { "command": "DisablePlugin",
 //      "path": "/Library/Internet Plug-Ins/Flash Player.plugin" }
 void TestingAutomationProvider::DisablePlugin(Browser* browser,
                                               DictionaryValue* args,
                                               IPC::Message* reply_message) {
   FilePath::StringType path;
   if (!args->GetString("path", &path)) {
     AutomationJSONReply(this, reply_message).SendError("path not specified.");
     return;
   }
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
   if (!plugin_prefs->CanEnablePlugin(false, FilePath(path))) {
     AutomationJSONReply(this, reply_message).SendError(
         StringPrintf("Could not disable plugin for path %s.", path.c_str()));
     return;
   }
   plugin_prefs->EnablePlugin(
       false, FilePath(path),
-      base::Bind(&TestingAutomationProvider::SendSuccessReply, this,
-                 reply_message));
+      base::Bind(SendSuccessReply, AsWeakPtr(), reply_message));
 }
 
 // Sample json input:
 //    { "command": "SaveTabContents",
 //      "tab_index": 0,
 //      "filename": <a full pathname> }
 // Sample json output:
 //    {}
 void TestingAutomationProvider::SaveTabContents(
     Browser* browser,
@@ skipping 2065 matching lines @@
     return;
   }
 
   bool control = !!(modifiers & automation::kControlKeyMask);
   bool shift = !!(modifiers & automation::kShiftKeyMask);
   bool alt = !!(modifiers & automation::kAltKeyMask);
   bool meta = !!(modifiers & automation::kMetaKeyMask);
   if (!ui_controls::SendKeyPressNotifyWhenDone(
           window, static_cast<ui::KeyboardCode>(keycode),
           control, shift, alt, meta,
-          base::Bind(&TestingAutomationProvider::SendSuccessReply, this,
-                     reply_message))) {
+          base::Bind(SendSuccessReply, AsWeakPtr(), reply_message))) {
     AutomationJSONReply(this, reply_message)
         .SendError("Could not send the native key event");
   }
 }
 
-void TestingAutomationProvider::SendSuccessReply(IPC::Message* reply_message) {
-  AutomationJSONReply(this, reply_message).SendSuccess(NULL);
-}
-
 void TestingAutomationProvider::ProcessWebMouseEvent(
     DictionaryValue* args,
     IPC::Message* reply_message) {
   if (SendErrorIfModalDialogActive(this, reply_message))
     return;
 
   RenderViewHost* view;
   std::string error;
   if (!GetRenderViewFromJSONArgs(args, profile(), &view, &error)) {
     AutomationJSONReply(this, reply_message).SendError(error);
@@ skipping 437 matching lines @@
 #endif
 }
 
 void TestingAutomationProvider::RefreshPolicies(
     base::DictionaryValue* args,
     IPC::Message* reply_message) {
 #if !defined(ENABLE_CONFIGURATION_POLICY)
   AutomationJSONReply(this, reply_message).SendError(
       "Configuration Policy disabled");
 #else
-  policy::BrowserPolicyConnector* connector =
-      g_browser_process->browser_policy_connector();
-  new PolicyUpdatesObserver(this, reply_message, connector);
-  connector->RefreshPolicies();
+  // Some policies (e.g. URLBlacklist) post tasks to other message loops
+  // before they start enforcing updated policy values; make sure those tasks
+  // have finished after a policy update.
+  // Updates of the URLBlacklist are done on IO, after building the blacklist
+  // on FILE, which is initiated from IO.
+  base::Closure reply =
+      base::Bind(SendSuccessReply, AsWeakPtr(), reply_message);
+  g_browser_process->policy_service()->RefreshPolicies(
+      base::Bind(PostTask, BrowserThread::IO,
+          base::Bind(PostTask, BrowserThread::FILE,
+              base::Bind(PostTask, BrowserThread::IO,
+                  base::Bind(PostTask, BrowserThread::UI, reply)))));
 #endif
 }
 
 void TestingAutomationProvider::GetIndicesFromTab(
     DictionaryValue* args,
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   int id_or_handle = 0;
   bool has_id = args->HasKey("tab_id");
   bool has_handle = args->HasKey("tab_handle");
@@ skipping 735 matching lines @@
       *browser_handle = browser_tracker_->Add(browser);
       *success = true;
     }
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }