Move the cloud policy protobufs into the component.

This change moved chrome/browser/policy/proto/chromeos to
chrome/browser/chromeos/policy/proto, and chrome/browser/policy/proto/cloud to
components/policy/proto.

This enables the component code to use the cloud policy protobufs, so that iOS
can use cloud policy.

The old location is still kept temporarily until new git mirrors are set up
pointing to the new locations. A couple of PRESUBMIT scripts check that the
files are kept in sync.

BUG=271392, 327345
TBR=mnissler@chromium.org

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

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

7 files changed, 73 insertions, 7 deletions

diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
index 0df14d4..a7da08c 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
@@ -19,7 +19,6 @@
 #include "base/values.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/policy/cloud/cloud_policy_invalidator.h"
-#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
@@ -28,6 +27,7 @@
 #include "components/policy/core/common/cloud/mock_cloud_policy_store.h"
 #include "components/policy/core/common/policy_types.h"
 #include "policy/policy_constants.h"
+#include "policy/proto/device_management_backend.pb.h"
 #include "sync/notifier/invalidation_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc
index c887c2c..ce1b5b9 100644
--- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/test_request_interceptor.h"
-#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
@@ -19,6 +18,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "policy/proto/device_management_backend.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
index 8e7e164..34703fb 100644
--- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
-#include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h"
 #include "chrome/browser/policy/test/local_policy_test_server.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -31,6 +30,7 @@
 #include "components/policy/core/common/policy_test_utils.h"
 #include "extensions/common/extension.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "policy/proto/chrome_extension_policy.pb.h"
 #include "policy/proto/cloud_policy.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/policy/cloud/test_request_interceptor.h b/chrome/browser/policy/cloud/test_request_interceptor.h
index ec22353..e3a740a 100644
--- a/chrome/browser/policy/cloud/test_request_interceptor.h
+++ b/chrome/browser/policy/cloud/test_request_interceptor.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
+#include "policy/proto/device_management_backend.pb.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/policy/cloud/user_cloud_policy_store.cc b/chrome/browser/policy/cloud/user_cloud_policy_store.cc
index 986e42c..4bcafdab 100644
--- a/chrome/browser/policy/cloud/user_cloud_policy_store.cc
+++ b/chrome/browser/policy/cloud/user_cloud_policy_store.cc
@@ -8,10 +8,9 @@
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
-#include "chrome/browser/policy/proto/cloud/device_management_local.pb.h"
 #include "policy/policy_constants.h"
 #include "policy/proto/cloud_policy.pb.h"
+#include "policy/proto/device_management_backend.pb.h"
 
 namespace em = enterprise_management;
 
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_android.cc b/chrome/browser/policy/cloud/user_policy_signin_service_android.cc
index 6efa336..dd2e921a 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_android.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_android.cc
@@ -13,7 +13,6 @@
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
-#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ -23,6 +22,7 @@
 #include "components/policy/core/common/policy_switches.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "policy/proto/device_management_backend.pb.h"
 
 namespace policy {
 
diff --git a/chrome/browser/policy/proto/PRESUBMIT.py b/chrome/browser/policy/proto/PRESUBMIT.py
new file mode 100644
index 0000000..406e24f
--- /dev/null
+++ b/chrome/browser/policy/proto/PRESUBMIT.py
@@ -0,0 +1,67 @@
+# 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.
+
+# TODO(joaodasilva): remove this file. http://crbug.com/327345
+
+import itertools
+
+def _CheckPolicyProtobufs(input_api, output_api):
+  # List of pairs (A, B) where A should equal B.
+  file_pairs = [
+    ( 'chrome/browser/policy/proto/chromeos/chrome_device_policy.proto',
+      'chrome/browser/chromeos/policy/proto/chrome_device_policy.proto' ),
+    ( 'chrome/browser/policy/proto/chromeos/install_attributes.proto',
+      'chrome/browser/chromeos/policy/proto/install_attributes.proto' ),
+    ( 'chrome/browser/policy/proto/cloud/chrome_extension_policy.proto',
+      'components/policy/proto/chrome_extension_policy.proto' ),
+    ( 'chrome/browser/policy/proto/cloud/device_management_backend.proto',
+      'components/policy/proto/device_management_backend.proto' ),
+    ( 'chrome/browser/policy/proto/cloud/device_management_local.proto',
+      'components/policy/proto/device_management_local.proto' ),
+    ( 'chrome/browser/policy/proto/PRESUBMIT.py',
+      'components/policy/proto/PRESUBMIT.py' ),
+    ( 'chrome/browser/chromeos/policy/proto/PRESUBMIT.py',
+      'components/policy/proto/PRESUBMIT.py' ),
+  ]
+
+  root = input_api.change.RepositoryRoot()
+  results = []
+
+  for file_a, file_b in file_pairs:
+    path_a = input_api.os_path.join(root, *file_a.split('/'))
+    path_b = input_api.os_path.join(root, *file_b.split('/'))
+    with open(path_a, 'r') as f_a:
+      content_a = f_a.read()
+    with open(path_b, 'r') as f_b:
+      content_b = f_b.read()
+    if content_a != content_b:
+      # If you get this error then check |file_pairs| and make sure that the
+      # contents of the files in each pair match.
+      results.append(output_api.PresubmitError(
+          '%s must equal %s. This is temporary until http://crbug.com/327345 '
+          'is fixed.' % (file_a, file_b)))
+
+  # If new files are added then |file_pairs| must be updated.
+  existing = frozenset(itertools.chain(*file_pairs))
+  for f in input_api.AffectedFiles():
+    if f.LocalPath() not in existing:
+      # If you get this error then add an entry for the new files to
+      # |file_pairs|.
+      results.append(output_api.PresubmitError(
+          'Please add an entry for %s to %s/PRESUBMIT.py' %
+          (f.LocalPath(), input_api.PresubmitLocalPath())))
+
+  return results
+
+
+def _CommonChecks(input_api, output_api):
+  return _CheckPolicyProtobufs(input_api, output_api)
+
+
+def CheckChangeOnUpload(input_api, output_api):
+  return _CommonChecks(input_api, output_api)
+
+
+def CheckChangeOnCommit(input_api, output_api):
+  return _CommonChecks(input_api, output_api)