Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / policy / chrome_browser_policy_connector.cc

diff --git a/src/chrome/browser/policy/chrome_browser_policy_connector.cc b/src/chrome/browser/policy/chrome_browser_policy_connector.cc
index 21124b9..54223b5 100644 (file)
--- a/src/chrome/browser/policy/chrome_browser_policy_connector.cc
+++ b/src/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ -33,6 +34,8 @@
 #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"
+#elif defined(OS_ANDROID)
+#include "components/policy/core/common/policy_provider_android.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -130,7 +133,7 @@ class DeviceManagementServiceConfiguration
 }  // namespace
 
 ChromeBrowserPolicyConnector::ChromeBrowserPolicyConnector()
-    : BrowserPolicyConnector(BuildHandlerList()) {
+    : BrowserPolicyConnector(base::Bind(&BuildHandlerList)) {
   ConfigurationPolicyProvider* platform_provider = CreatePlatformProvider();
   if (platform_provider)
     SetPlatformPolicyProvider(make_scoped_ptr(platform_provider));
@@ -180,6 +183,8 @@ ConfigurationPolicyProvider*
   } else {
     return NULL;
   }
+#elif defined(OS_ANDROID)
+  return new PolicyProviderAndroid();
 #else
   return NULL;
 #endif