Fixed crash in about:policy on OS_ANDROID and OS_IOS.

chrome/browser/ui/webui/policy_ui.cc

Index: chrome/browser/ui/webui/policy_ui.cc
diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc
index f6358e45e91d16422a1e9b92e565271de9ca6486..7367f1b335f8316687699af2e042b5a253055a13 100644
--- a/chrome/browser/ui/webui/policy_ui.cc
+++ b/chrome/browser/ui/webui/policy_ui.cc
@@ -15,8 +15,6 @@
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
@@ -34,9 +32,6 @@
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_set.h"
-#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
@@ -59,6 +54,14 @@
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #endif
 
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/manifest.h"
+#endif
+
 namespace em = enterprise_management;
 
 namespace {
@@ -522,6 +525,7 @@ void PolicyUIHandler::SendPolicyValues() const {
   GetChromePolicyValues(chrome_policies);
   all_policies.Set("chromePolicies", chrome_policies);
 
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
   // Get extensions.
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(Profile::FromWebUI(web_ui()));

[Joao da Silva, 2013/06/24 10:34:08]

Anita: this compiles but always returns NULL on OS_ANDROID. On OS_IOS this won't
link. You'll need something similar for the CL that sends extension policy names
to the page.

[anitawoodruff, 2013/06/24 11:53:52]

Done.

@@ -556,6 +560,7 @@ void PolicyUIHandler::SendPolicyValues() const {
     extension_values->Set(extension->id(), extension_value);
   }
   all_policies.Set("extensionPolicies", extension_values);
+#endif
 
   web_ui()->CallJavascriptFunction("policy.Page.setPolicyValues", all_policies);
 }