Move AppRestriction to Policy code out of //chrome

components/policy/core/browser/android/policy_converter.cc

+// Copyright 2015 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 "components/policy/core/browser/android/policy_converter.h"
+
+#include <vector>
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
+#include "base/json/json_reader.h"
+#include "base/logging.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/values.h"
+#include "components/policy/core/common/policy_bundle.h"
+#include "components/policy/core/common/policy_map.h"
+#include "components/policy/core/common/policy_namespace.h"
+#include "components/policy/core/common/policy_provider_android.h"

[Mattias Nissler (ping if slow), 2015/07/13 09:46:05]

needed?

[dgn, 2015/07/14 12:50:26]

Nope, removed also some forward declarations in the .h

+#include "components/policy/core/common/policy_types.h"
+#include "components/policy/core/common/schema.h"
+#include "jni/PolicyConverter_jni.h"
+
+using base::android::ConvertJavaStringToUTF8;
+
+namespace policy {
+namespace android {
+
+PolicyConverter::PolicyConverter(const Schema* policy_schema)
+    : policy_schema_(policy_schema), policy_bundle_(new PolicyBundle) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  java_obj_.Reset(env, Java_PolicyConverter_create(
+                           env, reinterpret_cast<long>(this)).obj());
+  DCHECK(!java_obj_.is_null());
+}
+
+PolicyConverter::~PolicyConverter() {
+  Java_PolicyConverter_onNativeDestroyed(base::android::AttachCurrentThread(),
+                                         java_obj_.obj());
+}
+
+scoped_ptr<PolicyBundle> PolicyConverter::GetPolicyBundle() {
+  scoped_ptr<PolicyBundle> filled_bundle(policy_bundle_.Pass());
+  policy_bundle_.reset(new PolicyBundle);
+  return filled_bundle.Pass();
+}
+
+base::android::ScopedJavaLocalRef<jobject> PolicyConverter::GetJavaObject() {
+  return base::android::ScopedJavaLocalRef<jobject>(java_obj_);
+}
+
+void PolicyConverter::SetPolicyBoolean(JNIEnv* env,
+                                       jobject obj,
+                                       jstring policyKey,
+                                       jboolean value) {
+  SetPolicyValue(ConvertJavaStringToUTF8(env, policyKey),
+                 new base::FundamentalValue(static_cast<bool>(value)));
+}
+
+void PolicyConverter::SetPolicyInteger(JNIEnv* env,
+                                       jobject obj,
+                                       jstring policyKey,
+                                       jint value) {
+  SetPolicyValue(ConvertJavaStringToUTF8(env, policyKey),
+                 new base::FundamentalValue(static_cast<int>(value)));
+}
+
+void PolicyConverter::SetPolicyString(JNIEnv* env,
+                                      jobject obj,
+                                      jstring policyKey,
+                                      jstring value) {
+  SetPolicyValue(ConvertJavaStringToUTF8(env, policyKey),
+                 new base::StringValue(ConvertJavaStringToUTF8(env, value)));
+}
+
+void PolicyConverter::SetPolicyStringArray(JNIEnv* env,
+                                           jobject obj,
+                                           jstring policyKey,
+                                           jobjectArray array) {
+  std::vector<base::string16> string_vector;
+  base::android::AppendJavaStringArrayToStringVector(env, array,
+                                                     &string_vector);
+  base::ListValue* list_values = new base::ListValue();
+  list_values->AppendStrings(string_vector);

[Mattias Nissler (ping if slow), 2015/07/13 09:46:05]

Double conversion via std::vector seems convoluted, can't we go from
jobjectArray to ListValue directly?

[Bernhard Bauer, 2015/07/13 10:46:03]

Short answer: No :)

Longer answer: We need to convert a Java String[] to a native base::ListValue,
which has a list of base::Value internally, so we first need to convert all the
Java strings, then wrap each of them in a base::StringValue and insert them into
the ListValue.

[Mattias Nissler (ping if slow), 2015/07/13 11:27:13]

Note that your longer answer specifically doesn't mention the intermediate
std::vector<string>. Why not just loop over |array| and insert it intoe
|list_values| (which is named misleadingly btw.)?

[dgn, 2015/07/14 12:50:25]

Added it as a separate method. I would have been more comfortable with just
using the provided function from //base and I'm not super convinced not creating
the vector makes a big difference, be there it is.

+  SetPolicyValue(ConvertJavaStringToUTF8(env, policyKey), list_values);
+}
+
+// static
+scoped_ptr<base::Value> PolicyConverter::ConvertValueToSchema(
+    scoped_ptr<base::Value> value,
+    const Schema& schema) {
+  if (!schema.valid())
+    return value.Pass();
+
+  switch (schema.type()) {
+    case base::Value::TYPE_NULL:
+      return base::Value::CreateNullValue();
+
+    case base::Value::TYPE_BOOLEAN: {
+      std::string string_value;
+      if (value->GetAsString(&string_value)) {
+        if (string_value.compare("true") == 0)
+          return make_scoped_ptr(new base::FundamentalValue(true));
+
+        if (string_value.compare("false") == 0)
+          return make_scoped_ptr(new base::FundamentalValue(false));
+
+        return value.Pass();
+      }
+      int int_value = 0;
+      if (value->GetAsInteger(&int_value))
+        return make_scoped_ptr(new base::FundamentalValue(int_value != 0));
+
+      return value.Pass();
+    }
+
+    case base::Value::TYPE_INTEGER: {
+      std::string string_value;
+      if (value->GetAsString(&string_value)) {
+        int int_value = 0;
+        if (base::StringToInt(string_value, &int_value))
+          return make_scoped_ptr(new base::FundamentalValue(int_value));
+      }
+      return value.Pass();
+    }
+
+    case base::Value::TYPE_DOUBLE: {
+      std::string string_value;
+      if (value->GetAsString(&string_value)) {
+        double double_value = 0;
+        if (base::StringToDouble(string_value, &double_value))
+          return make_scoped_ptr(new base::FundamentalValue(double_value));
+      }
+      return value.Pass();
+    }
+
+    // String can't be converted from other types.
+    case base::Value::TYPE_STRING: {
+      return value.Pass();
+    }
+
+    // Binary is not a valid schema type.
+    case base::Value::TYPE_BINARY: {
+      NOTREACHED();
+      return scoped_ptr<base::Value>();
+    }
+
+    // Complex types have to be deserialized from JSON.
+    case base::Value::TYPE_DICTIONARY:
+    case base::Value::TYPE_LIST: {
+      std::string string_value;
+      if (value->GetAsString(&string_value)) {
+        scoped_ptr<base::Value> decoded_value =
+            base::JSONReader::Read(string_value);
+        if (decoded_value)
+          return decoded_value.Pass();
+      }
+      return value.Pass();
+    }
+  }
+
+  NOTREACHED();
+  return scoped_ptr<base::Value>();
+}
+
+// static
+bool PolicyConverter::Register(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+void PolicyConverter::SetPolicyValue(const std::string& key,
+                                     base::Value* value) {
+  const Schema schema = policy_schema_->GetKnownProperty(key);
+  const PolicyNamespace ns(POLICY_DOMAIN_CHROME, std::string());
+  policy_bundle_->Get(ns).Set(
+      key, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+      ConvertValueToSchema(make_scoped_ptr(value), schema).release(), nullptr);
+}
+
+}  // namespace android
+}  // namespace policy