Move PolicyErrorMap to components/policy/.

Facilitates policy componentization. Also add DEPS exceptions for ui
and grit includes.

BUG=271392
TBR=sky

Review URL: https://codereview.chromium.org/103263003

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

27 files changed, 38 insertions, 31 deletions

diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
index 0a48afb7..b9043e1 100644
--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
@@ -15,7 +15,6 @@
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/policy/login_screen_power_management_policy.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/power_policy_controller.h"
@@ -23,6 +22,7 @@
 #include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/onc/onc_validator.h"
 #include "components/onc/onc_constants.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
index 2458338..21cd13d 100644
--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/callback.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_map.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
index e169496f..a852cd1 100644
--- a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
+++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/policy/login_screen_power_management_policy.h"
-#include "chrome/browser/policy/policy_error_map.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_bundle.h"
 #include "components/policy/core/common/policy_map.h"
diff --git a/chrome/browser/chromeos/policy/login_screen_power_management_policy.cc b/chrome/browser/chromeos/policy/login_screen_power_management_policy.cc
index 93aad57..57a0cd9 100644
--- a/chrome/browser/chromeos/policy/login_screen_power_management_policy.cc
+++ b/chrome/browser/chromeos/policy/login_screen_power_management_policy.cc
@@ -8,8 +8,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/policy/configuration_policy_handler.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chromeos/dbus/power_policy_controller.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
 
diff --git a/chrome/browser/chromeos/policy/login_screen_power_management_policy_unittest.cc b/chrome/browser/chromeos/policy/login_screen_power_management_policy_unittest.cc
index b666264..61bcb7c 100644
--- a/chrome/browser/chromeos/policy/login_screen_power_management_policy_unittest.cc
+++ b/chrome/browser/chromeos/policy/login_screen_power_management_policy_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/chromeos/policy/login_screen_power_management_policy.h"
 
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chromeos/dbus/power_policy_controller.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/extensions/policy_handlers.cc b/chrome/browser/extensions/policy_handlers.cc
index d0669b2..005fdc2 100644
--- a/chrome/browser/extensions/policy_handlers.cc
+++ b/chrome/browser/extensions/policy_handlers.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "base/prefs/pref_value_map.h"
 #include "chrome/browser/extensions/external_policy_loader.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "extensions/common/extension.h"
 #include "grit/component_strings.h"
diff --git a/chrome/browser/extensions/policy_handlers_unittest.cc b/chrome/browser/extensions/policy_handlers_unittest.cc
index 7d14f98..270b2ff 100644
--- a/chrome/browser/extensions/policy_handlers_unittest.cc
+++ b/chrome/browser/extensions/policy_handlers_unittest.cc
@@ -5,8 +5,8 @@
 #include "base/prefs/pref_value_map.h"
 #include "chrome/browser/extensions/external_policy_loader.h"
 #include "chrome/browser/extensions/policy_handlers.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/net/proxy_policy_handler.cc b/chrome/browser/net/proxy_policy_handler.cc
index be01502..9e848b7 100644
--- a/chrome/browser/net/proxy_policy_handler.cc
+++ b/chrome/browser/net/proxy_policy_handler.cc
@@ -9,10 +9,10 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/policy/configuration_policy_handler.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc
index af7ddee..d0341d9 100644
--- a/chrome/browser/policy/configuration_policy_handler.cc
+++ b/chrome/browser/policy/configuration_policy_handler.cc
@@ -14,7 +14,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
-#include "chrome/browser/policy/policy_error_map.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
 #include "url/gurl.h"
diff --git a/chrome/browser/policy/configuration_policy_handler_android.cc b/chrome/browser/policy/configuration_policy_handler_android.cc
index a900e4a..e5c5d8e 100644
--- a/chrome/browser/policy/configuration_policy_handler_android.cc
+++ b/chrome/browser/policy/configuration_policy_handler_android.cc
@@ -6,9 +6,9 @@
 
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc
index 41392b5..a7b503a 100644
--- a/chrome/browser/policy/configuration_policy_handler_list.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list.cc
@@ -17,13 +17,13 @@
 #include "chrome/browser/policy/configuration_policy_handler.h"
 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h"
 #include "chrome/browser/policy/javascript_policy_handler.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/url_blacklist_policy_handler.h"
 #include "chrome/browser/profiles/incognito_mode_policy_handler.h"
 #include "chrome/browser/search_engines/default_search_policy_handler.h"
 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
 #include "chrome/browser/sync/sync_policy_handler.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_details.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_pref_names.h"
diff --git a/chrome/browser/policy/configuration_policy_handler_unittest.cc b/chrome/browser/policy/configuration_policy_handler_unittest.cc
index 114569a..d648f12 100644
--- a/chrome/browser/policy/configuration_policy_handler_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_handler_unittest.cc
@@ -6,7 +6,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
 #include "chrome/browser/policy/configuration_policy_handler.h"
-#include "chrome/browser/policy/policy_error_map.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index fa3afb0..9c5e221 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -14,7 +14,7 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/policy/configuration_policy_handler_list.h"
-#include "chrome/browser/policy/policy_error_map.h"
+#include "components/policy/core/browser/policy_error_map.h"
 
 namespace policy {
 
diff --git a/chrome/browser/policy/javascript_policy_handler.cc b/chrome/browser/policy/javascript_policy_handler.cc
index 69d2900..8a4b7e8 100644
--- a/chrome/browser/policy/javascript_policy_handler.cc
+++ b/chrome/browser/policy/javascript_policy_handler.cc
@@ -6,9 +6,9 @@
 
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc
index 778228e..c5b42f5 100644
--- a/chrome/browser/policy/javascript_policy_handler_unittest.cc
+++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_pref_store_unittest.h"
 #include "chrome/browser/policy/javascript_policy_handler.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "policy/policy_constants.h"
 
diff --git a/chrome/browser/policy/url_blacklist_policy_handler.cc b/chrome/browser/policy/url_blacklist_policy_handler.cc
index 8a775c8..f7433e6 100644
--- a/chrome/browser/policy/url_blacklist_policy_handler.cc
+++ b/chrome/browser/policy/url_blacklist_policy_handler.cc
@@ -7,8 +7,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/policy/url_blacklist_policy_handler_unittest.cc b/chrome/browser/policy/url_blacklist_policy_handler_unittest.cc
index 4886abb..fe1dba3 100644
--- a/chrome/browser/policy/url_blacklist_policy_handler_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_policy_handler_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/url_blacklist_policy_handler.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/generated_resources.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/profiles/incognito_mode_policy_handler.cc b/chrome/browser/profiles/incognito_mode_policy_handler.cc
index a3006a1..41bedf2 100644
--- a/chrome/browser/profiles/incognito_mode_policy_handler.cc
+++ b/chrome/browser/profiles/incognito_mode_policy_handler.cc
@@ -8,9 +8,9 @@
 #include "base/prefs/pref_value_map.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/search_engines/default_search_policy_handler.cc b/chrome/browser/search_engines/default_search_policy_handler.cc
index c0d1e9b..ae6c0de 100644
--- a/chrome/browser/search_engines/default_search_policy_handler.cc
+++ b/chrome/browser/search_engines/default_search_policy_handler.cc
@@ -8,10 +8,10 @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/component_strings.h"
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler.cc b/chrome/browser/sessions/restore_on_startup_policy_handler.cc
index 13eda2d..cd42ecc 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler.cc
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler.cc
@@ -7,9 +7,9 @@
 #include "base/prefs/pref_value_map.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
index cbdc539..edfb97e 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
@@ -11,10 +11,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/policy/configuration_policy_handler.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
 #include "chrome/common/pref_names.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc
index ca7f2bb..17a1bf5 100644
--- a/chrome/browser/ui/webui/policy_ui.cc
+++ b/chrome/browser/ui/webui/policy_ui.cc
@@ -26,7 +26,6 @@
 #include "chrome/browser/policy/cloud/cloud_policy_validator.h"
 #include "chrome/browser/policy/cloud/message_util.h"
 #include "chrome/browser/policy/configuration_policy_handler_list.h"
-#include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
@@ -35,6 +34,7 @@
 #include "chrome/browser/policy/schema_registry_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
+#include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_types.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9e843a7..4199970 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1534,8 +1534,6 @@
         'browser/policy/file_selection_dialogs_policy_handler.h',
         'browser/policy/javascript_policy_handler.cc',
         'browser/policy/javascript_policy_handler.h',
-        'browser/policy/policy_error_map.cc',
-        'browser/policy/policy_error_map.h',
         'browser/policy/policy_load_status.cc',
         'browser/policy/policy_load_status.h',
         'browser/policy/policy_loader_mac.cc',
diff --git a/components/policy.gypi b/components/policy.gypi
index 9bef4f0..0b48ced 100644
--- a/components/policy.gypi
+++ b/components/policy.gypi
@@ -9,6 +9,7 @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
+        '../ui/ui.gyp:ui',
         'json_schema',
         'component_strings.gyp:component_strings',
       ],
@@ -21,6 +22,8 @@
       'conditions': [
         ['configuration_policy==1', {
           'sources': [
+            'policy/core/browser/policy_error_map.cc',
+            'policy/core/browser/policy_error_map.h',
             'policy/core/common/async_policy_loader.cc',
             'policy/core/common/async_policy_loader.h',
             'policy/core/common/async_policy_provider.cc',
diff --git a/components/policy/core/browser/DEPS b/components/policy/core/browser/DEPS
new file mode 100644
index 0000000..0410926
--- /dev/null
+++ b/components/policy/core/browser/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+  "+grit/component_strings.h", # For generated headers
+  "+ui/base/l10n",
+  "+ui/base/resource",
+]
diff --git a/chrome/browser/policy/policy_error_map.cc b/components/policy/core/browser/policy_error_map.cc
index ee49b0e..0c358c5 100644
--- a/chrome/browser/policy/policy_error_map.cc
+++ b/components/policy/core/browser/policy_error_map.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/policy/policy_error_map.h"
+#include "components/policy/core/browser/policy_error_map.h"
 
 #include <utility>
 
diff --git a/chrome/browser/policy/policy_error_map.h b/components/policy/core/browser/policy_error_map.h
index 7c3b06e..afc9706 100644
--- a/chrome/browser/policy/policy_error_map.h
+++ b/components/policy/core/browser/policy_error_map.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_POLICY_POLICY_ERROR_MAP_H_
-#define CHROME_BROWSER_POLICY_POLICY_ERROR_MAP_H_
+#ifndef COMPONENTS_POLICY_CORE_BROWSER_POLICY_ERROR_MAP_H_
+#define COMPONENTS_POLICY_CORE_BROWSER_POLICY_ERROR_MAP_H_
 
 #include <map>
 #include <string>
@@ -11,11 +11,12 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
+#include "components/policy/policy_export.h"
 
 namespace policy {
 
 // Collects error messages and their associated policies.
-class PolicyErrorMap {
+class POLICY_EXPORT PolicyErrorMap {
  public:
   typedef std::multimap<std::string, string16> PolicyMapType;
   typedef PolicyMapType::const_iterator const_iterator;
@@ -99,4 +100,4 @@ class PolicyErrorMap {
 
 }  // namespace policy
 
-#endif  // CHROME_BROWSER_POLICY_POLICY_ERROR_MAP_H_
+#endif  // COMPONENTS_POLICY_CORE_BROWSER_POLICY_ERROR_MAP_H_