Enabling android builds with configuration_policy enabled.

The configuration_policy flag in GYP determines whether Chrome is built with
policy support or not. This change fixes build issues when that flag is
enabled, but doesn't turn it on by default on Android.

TBR=jochen@chromium.org
BUG=247435

Review URL: https://chromiumcodereview.appspot.com/16359018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205086 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 35 insertions, 26 deletions

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 61306d3c..c6ace91 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -77,7 +77,6 @@
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/browser/performance_monitor/startup_timer.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
-#include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -187,10 +186,6 @@
 #include "chrome/browser/mac/keystone_glue.h"
 #endif
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#include "policy/policy_constants.h"
-#endif
-
 #if defined(ENABLE_LANGUAGE_DETECTION)
 #include "chrome/browser/language_usage_metrics.h"
 #endif
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index ee9636b..05851b1e 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -44,7 +44,7 @@
 #elif defined(OS_MACOSX)
 #include "chrome/browser/policy/policy_loader_mac.h"
 #include "chrome/browser/policy/preferences_mac.h"
-#elif defined(OS_POSIX)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
 #include "chrome/browser/policy/config_dir_policy_loader.h"
 #endif
 
@@ -480,7 +480,7 @@ ConfigurationPolicyProvider* BrowserPolicyConnector::CreatePlatformProvider() {
   scoped_ptr<AsyncPolicyLoader> loader(
       new PolicyLoaderMac(policy_list, new MacPreferences()));
   return new AsyncPolicyProvider(loader.Pass());
-#elif defined(OS_POSIX)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
   base::FilePath config_dir_path;
   if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
     scoped_ptr<AsyncPolicyLoader> loader(
diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc
index f3b8323..9f9a05a 100644
--- a/chrome/browser/policy/configuration_policy_handler.cc
+++ b/chrome/browser/policy/configuration_policy_handler.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/policy_map.h"
-#include "chrome/browser/policy/policy_path_parser.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
@@ -34,6 +33,10 @@
 #include "grit/generated_resources.h"
 #include "policy/policy_constants.h"
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/policy/policy_path_parser.h"
+#endif
+
 namespace policy {
 
 namespace {
@@ -678,6 +681,9 @@ void AutofillPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
   }
 }
 
+// Android doesn't support these policies, and doesn't have a policy_path_parser
+// implementation.
+#if !defined(OS_ANDROID)
 
 // DownloadDirPolicyHandler implementation -------------------------------------
 
@@ -733,6 +739,7 @@ void DiskCacheDirPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
   }
 }
 
+#endif  // !defined(OS_ANDROID)
 
 // FileSelectionDialogsHandler implementation ----------------------------------
 
diff --git a/chrome/browser/policy/configuration_policy_handler.h b/chrome/browser/policy/configuration_policy_handler.h
index 0a06703..449a11a 100644
--- a/chrome/browser/policy/configuration_policy_handler.h
+++ b/chrome/browser/policy/configuration_policy_handler.h
@@ -317,6 +317,8 @@ class AutofillPolicyHandler : public TypeCheckingPolicyHandler {
   DISALLOW_COPY_AND_ASSIGN(AutofillPolicyHandler);
 };
 
+#if !defined(OS_ANDROID)
+
 // ConfigurationPolicyHandler for the DownloadDirectory policy.
 class DownloadDirPolicyHandler : public TypeCheckingPolicyHandler {
  public:
@@ -345,6 +347,8 @@ class DiskCacheDirPolicyHandler : public TypeCheckingPolicyHandler {
   DISALLOW_COPY_AND_ASSIGN(DiskCacheDirPolicyHandler);
 };
 
+#endif  // !defined(OS_ANDROID)
+
 // ConfigurationPolicyHandler for the FileSelectionDialogsHandler policy.
 class FileSelectionDialogsHandler : public TypeCheckingPolicyHandler {
  public:
diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc
index b653f55..4503ca6 100644
--- a/chrome/browser/policy/configuration_policy_handler_list.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list.cc
@@ -411,7 +411,6 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() {
 
   handlers_.push_back(new AutofillPolicyHandler());
   handlers_.push_back(new DefaultSearchPolicyHandler());
-  handlers_.push_back(new DiskCacheDirPolicyHandler());
   handlers_.push_back(new FileSelectionDialogsHandler());
   handlers_.push_back(new IncognitoModePolicyHandler());
   handlers_.push_back(new JavascriptPolicyHandler());
@@ -445,9 +444,10 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() {
                                      false));
 #endif  // defined(OS_CHROMEOS)
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+  handlers_.push_back(new DiskCacheDirPolicyHandler());
   handlers_.push_back(new DownloadDirPolicyHandler());
-#endif  // !defined(OS_CHROMEOS)
+#endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
   handlers_.push_back(
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index 63120ea..af7767d 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -153,18 +153,19 @@ INSTANTIATE_TEST_CASE_P(
                       prefs::kAuthNegotiateDelegateWhitelist),
         PolicyAndPref(key::kGSSAPILibraryName,
                       prefs::kGSSAPILibraryName),
-        PolicyAndPref(key::kDiskCacheDir,
-                      prefs::kDiskCacheDir),
         PolicyAndPref(key::kVariationsRestrictParameter,
                       prefs::kVariationsRestrictParameter)));
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 INSTANTIATE_TEST_CASE_P(
     ConfigurationPolicyPrefStoreDownloadDirectoryInstance,
     ConfigurationPolicyPrefStoreStringTest,
-    testing::Values(PolicyAndPref(key::kDownloadDirectory,
-                                  prefs::kDownloadDefaultDirectory)));
-#endif  // !defined(OS_CHROMEOS)
+    testing::Values(
+        PolicyAndPref(key::kDiskCacheDir,
+                      prefs::kDiskCacheDir),
+        PolicyAndPref(key::kDownloadDirectory,
+                      prefs::kDownloadDefaultDirectory)));
+#endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 
 // Test cases for boolean-valued policy settings.
 class ConfigurationPolicyPrefStoreBooleanTest
@@ -925,7 +926,7 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, Default) {
   EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
 }
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, SetDownloadDirectory) {
   PolicyMap policy;
   EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
@@ -945,7 +946,7 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, SetDownloadDirectory) {
   ASSERT_TRUE(result);
   EXPECT_FALSE(prompt_for_download);
 }
-#endif  // !defined(OS_CHROMEOS)
+#endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 
 TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest,
        EnableFileSelectionDialogs) {
diff --git a/chrome/browser/policy/policy_bundle_unittest.cc b/chrome/browser/policy/policy_bundle_unittest.cc
index 2d47596..f06207a 100644
--- a/chrome/browser/policy/policy_bundle_unittest.cc
+++ b/chrome/browser/policy/policy_bundle_unittest.cc
@@ -78,13 +78,13 @@ TEST(PolicyBundleTest, Get) {
                                          std::string())).Equals(policy));
 
   PolicyBundle::const_iterator it = bundle.begin();
-  ASSERT_NE(it, bundle.end());
+  ASSERT_TRUE(it != bundle.end());
   EXPECT_EQ(POLICY_DOMAIN_CHROME, it->first.domain);
   EXPECT_EQ("", it->first.component_id);
   ASSERT_TRUE(it->second);
   EXPECT_TRUE(it->second->Equals(policy));
   ++it;
-  EXPECT_EQ(bundle.end(), it);
+  EXPECT_TRUE(it == bundle.end());
   EXPECT_TRUE(bundle.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS,
                                          kExtension0)).empty());
 
diff --git a/chrome/browser/policy/policy_domain_descriptor_unittest.cc b/chrome/browser/policy/policy_domain_descriptor_unittest.cc
index 0f64cc9..5edea9e 100644
--- a/chrome/browser/policy/policy_domain_descriptor_unittest.cc
+++ b/chrome/browser/policy/policy_domain_descriptor_unittest.cc
@@ -47,8 +47,7 @@ TEST(PolicyDomainDescriptor, FilterBundle) {
   descriptor->RegisterComponent("abc", schema.Pass());
 
   EXPECT_EQ(1u, descriptor->components().size());
-  EXPECT_NE(descriptor->components().end(),
-            descriptor->components().find("abc"));
+  EXPECT_EQ(1u, descriptor->components().count("abc"));
 
   PolicyBundle bundle;
   descriptor->FilterBundle(&bundle);
diff --git a/chrome/browser/policy/test/local_policy_test_server.cc b/chrome/browser/policy/test/local_policy_test_server.cc
index 16bb046..63fd872 100644
--- a/chrome/browser/policy/test/local_policy_test_server.cc
+++ b/chrome/browser/policy/test/local_policy_test_server.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/policy/test/local_policy_test_server.h"
 
+#include <ctype.h>
+
 #include <algorithm>
 #include <vector>
 
@@ -247,4 +249,4 @@ std::string LocalPolicyTestServer::GetSelector(const std::string& type,
   return selector;
 }
 
-}  // namespace policy;
+}  // namespace policy
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index e887532f..68d4fcc 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -353,13 +353,14 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (url.host() == chrome::kChromeUIPolicyHost)
     return &NewWebUI<PolicyUI>;
-#endif
 
-#if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
     return &NewWebUI<ProfileSigninConfirmationUI>;
 #endif
 
+#endif  // defined(ENABLE_CONFIGURATION_POLICY)
+
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
   if (url.host() == chrome::kChromeUITabModalConfirmDialogHost) {
     return &NewWebUI<ConstrainedWebDialogUI>;