Move AppRestriction to Policy code out of //chrome

chrome/browser/android/policy/policy_manager.h

Index: chrome/browser/android/policy/policy_manager.h
diff --git a/chrome/browser/android/policy/policy_manager.h b/chrome/browser/android/policy/policy_manager.h
index a24650d6f131d61961b37c0b1d4f58dd1d046ae0..d0fb50598f7c049752ed61327b691be0f3f79b71 100644
--- a/chrome/browser/android/policy/policy_manager.h
+++ b/chrome/browser/android/policy/policy_manager.h
@@ -8,52 +8,19 @@
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
-#include "components/policy/core/common/policy_bundle.h"
+#include "components/policy/core/browser/android/app_restrictions_importer.h"
 #include "components/policy/core/common/policy_provider_android_delegate.h"
 
-namespace policy {
-
-class PolicyProviderAndroid;
-class Schema;
-
-}  // namespace policy
-
-class PolicyManager : public policy::PolicyProviderAndroidDelegate {
+class PolicyManager : public policy::AppRestrictionsImporter,
+                      public policy::PolicyProviderAndroidDelegate {
  public:
   PolicyManager(JNIEnv* env, jobject obj);
 
-  // Called from Java:
-  void SetPolicyBoolean(JNIEnv* env,
-                        jobject obj,
-                        jstring policyKey,
-                        jboolean value);
-  void SetPolicyInteger(JNIEnv* env,
-                        jobject obj,
-                        jstring policyKey,
-                        jint value);
-  void SetPolicyString(JNIEnv* env,
-                       jobject obj,
-                       jstring policyKey,
-                       jstring value);
-  void SetPolicyStringArray(JNIEnv* env,
-                            jobject obj,
-                            jstring policyKey,
-                            jobjectArray value);
-  void FlushPolicies(JNIEnv* env, jobject obj);
-
   void Destroy(JNIEnv* env, jobject obj);
 
-  // Converts the passed in value to the type desired by the schema. If the
-  // value is not convertible, it is returned unchanged, so the policy system
-  // can report the error.
-  // Note that this method will only look at the type of the schema, not at any
-  // additional restrictions, or the schema for value's items or properties in
-  // the case of a list or dictionary value.
-  // This method takes ownership of the passed in value, and the caller takes
-  // ownership of the return value.
-  // Public for testing.
-  static base::Value* ConvertValueToSchema(base::Value* raw_value,
-                                           const policy::Schema& schema);
+  // AppRestrictionsImporter:

[bartfab (slow), 2015/07/03 16:55:47]

1: Why are these two methods public?
2: Nit: Prefix with "policy::"

[dgn, 2015/07/06 17:34:02]

Made them private.

+  policy::Schema GetPolicySchema(const std::string& key) override;
+  policy::PolicyProviderAndroid* GetPolicyProvider() override;
 
   // PolicyProviderAndroidDelegate:
   void RefreshPolicies() override;
@@ -64,11 +31,8 @@ class PolicyManager : public policy::PolicyProviderAndroidDelegate {
 
   JavaObjectWeakGlobalRef weak_java_policy_manager_;
 
-  scoped_ptr<policy::PolicyBundle> policy_bundle_;
   policy::PolicyProviderAndroid* policy_provider_;

[bartfab (slow), 2015/07/03 16:55:47]

Nit: Forward-declare |policy::PolicyProviderAndroid|.

[dgn, 2015/07/06 17:34:02]

Done.

 
-  void SetPolicyValue(const std::string& key, base::Value* value);
-
   DISALLOW_COPY_AND_ASSIGN(PolicyManager);

[bartfab (slow), 2015/07/03 16:55:47]

Nit: #include "base/macros.h"

[dgn, 2015/07/06 17:34:02]

Done.

 };