| Index: chrome/browser/android/policy/policy_manager_unittest.cc
 | 
| diff --git a/chrome/browser/android/policy/policy_manager_unittest.cc b/chrome/browser/android/policy/policy_manager_unittest.cc
 | 
| deleted file mode 100644
 | 
| index 99967b52a93890bf43c17cbb2d960c3abff2941c..0000000000000000000000000000000000000000
 | 
| --- a/chrome/browser/android/policy/policy_manager_unittest.cc
 | 
| +++ /dev/null
 | 
| @@ -1,137 +0,0 @@
 | 
| -// 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 "base/json/json_writer.h"
 | 
| -#include "base/values.h"
 | 
| -#include "chrome/browser/android/policy/policy_manager.h"
 | 
| -#include "components/policy/core/common/schema.h"
 | 
| -#include "testing/gtest/include/gtest/gtest.h"
 | 
| -
 | 
| -using base::DictionaryValue;
 | 
| -using base::FundamentalValue;
 | 
| -using base::ListValue;
 | 
| -using base::StringValue;
 | 
| -using base::Value;
 | 
| -
 | 
| -class PolicyManagerTest : public testing::Test {
 | 
| - public:
 | 
| -  void SetUp() override {
 | 
| -    const char kSchemaTemplate[] =
 | 
| -        "{"
 | 
| -        "  \"type\": \"object\","
 | 
| -        "  \"properties\": {"
 | 
| -        "    \"null\": { \"type\": \"null\" },"
 | 
| -        "    \"bool\": { \"type\": \"boolean\" },"
 | 
| -        "    \"int\": { \"type\": \"integer\" },"
 | 
| -        "    \"double\": { \"type\": \"number\" },"
 | 
| -        "    \"string\": { \"type\": \"string\" },"
 | 
| -        "    \"list\": {"
 | 
| -        "      \"type\": \"array\","
 | 
| -        "      \"items\": { \"type\": \"string\"}"
 | 
| -        "    },"
 | 
| -        "    \"dict\": { \"type\": \"object\" }"
 | 
| -        "  }"
 | 
| -        "}";
 | 
| -
 | 
| -    std::string error;
 | 
| -    schema_ = policy::Schema::Parse(kSchemaTemplate, &error);
 | 
| -    ASSERT_TRUE(schema_.valid()) << error;
 | 
| -  }
 | 
| -
 | 
| - protected:
 | 
| -  // Converts the passed in value to the passed in schema, and serializes the
 | 
| -  // result to JSON, to make it easier to compare with EXPECT_EQ.
 | 
| -  std::string Convert(Value* value, const policy::Schema& value_schema) {
 | 
| -    scoped_ptr<Value> converted_value(
 | 
| -        PolicyManager::ConvertValueToSchema(value, value_schema));
 | 
| -
 | 
| -    std::string json_string;
 | 
| -    EXPECT_TRUE(
 | 
| -        base::JSONWriter::Write(*(converted_value.get()), &json_string));
 | 
| -    return json_string;
 | 
| -  }
 | 
| -
 | 
| -  policy::Schema schema_;
 | 
| -};
 | 
| -
 | 
| -TEST_F(PolicyManagerTest, ConvertToNullValue) {
 | 
| -  policy::Schema null_schema = schema_.GetKnownProperty("null");
 | 
| -  ASSERT_TRUE(null_schema.valid());
 | 
| -
 | 
| -  EXPECT_EQ("null", Convert(new StringValue("foo"), null_schema));
 | 
| -}
 | 
| -
 | 
| -TEST_F(PolicyManagerTest, ConvertToBoolValue) {
 | 
| -  policy::Schema bool_schema = schema_.GetKnownProperty("bool");
 | 
| -  ASSERT_TRUE(bool_schema.valid());
 | 
| -
 | 
| -  EXPECT_EQ("true", Convert(new FundamentalValue(true), bool_schema));
 | 
| -  EXPECT_EQ("false", Convert(new FundamentalValue(false), bool_schema));
 | 
| -  EXPECT_EQ("true", Convert(new StringValue("true"), bool_schema));
 | 
| -  EXPECT_EQ("false", Convert(new StringValue("false"), bool_schema));
 | 
| -  EXPECT_EQ("\"narf\"", Convert(new StringValue("narf"), bool_schema));
 | 
| -  EXPECT_EQ("false", Convert(new FundamentalValue(0), bool_schema));
 | 
| -  EXPECT_EQ("true", Convert(new FundamentalValue(1), bool_schema));
 | 
| -  EXPECT_EQ("true", Convert(new FundamentalValue(42), bool_schema));
 | 
| -  EXPECT_EQ("true", Convert(new FundamentalValue(-1), bool_schema));
 | 
| -  EXPECT_EQ("\"1\"", Convert(new StringValue("1"), bool_schema));
 | 
| -  EXPECT_EQ("{}", Convert(new DictionaryValue(), bool_schema));
 | 
| -}
 | 
| -
 | 
| -TEST_F(PolicyManagerTest, ConvertToIntValue) {
 | 
| -  policy::Schema int_schema = schema_.GetKnownProperty("int");
 | 
| -  ASSERT_TRUE(int_schema.valid());
 | 
| -
 | 
| -  EXPECT_EQ("23", Convert(new FundamentalValue(23), int_schema));
 | 
| -  EXPECT_EQ("42", Convert(new StringValue("42"), int_schema));
 | 
| -  EXPECT_EQ("-1", Convert(new StringValue("-1"), int_schema));
 | 
| -  EXPECT_EQ("\"poit\"", Convert(new StringValue("poit"), int_schema));
 | 
| -  EXPECT_EQ("false", Convert(new FundamentalValue(false), int_schema));
 | 
| -}
 | 
| -
 | 
| -TEST_F(PolicyManagerTest, ConvertToDoubleValue) {
 | 
| -  policy::Schema double_schema = schema_.GetKnownProperty("double");
 | 
| -  ASSERT_TRUE(double_schema.valid());
 | 
| -
 | 
| -  EXPECT_EQ("3", Convert(new FundamentalValue(3), double_schema));
 | 
| -  EXPECT_EQ("3.14", Convert(new FundamentalValue(3.14), double_schema));
 | 
| -  EXPECT_EQ("2.71", Convert(new StringValue("2.71"), double_schema));
 | 
| -  EXPECT_EQ("\"zort\"", Convert(new StringValue("zort"), double_schema));
 | 
| -  EXPECT_EQ("true", Convert(new FundamentalValue(true), double_schema));
 | 
| -}
 | 
| -
 | 
| -TEST_F(PolicyManagerTest, ConvertToStringValue) {
 | 
| -  policy::Schema string_schema = schema_.GetKnownProperty("string");
 | 
| -  ASSERT_TRUE(string_schema.valid());
 | 
| -
 | 
| -  EXPECT_EQ("\"troz\"", Convert(new StringValue("troz"), string_schema));
 | 
| -  EXPECT_EQ("4711", Convert(new FundamentalValue(4711), string_schema));
 | 
| -}
 | 
| -
 | 
| -TEST_F(PolicyManagerTest, ConvertToListValue) {
 | 
| -  policy::Schema list_schema = schema_.GetKnownProperty("list");
 | 
| -  ASSERT_TRUE(list_schema.valid());
 | 
| -
 | 
| -  ListValue* list = new ListValue;
 | 
| -  list->AppendString("foo");
 | 
| -  list->AppendString("bar");
 | 
| -  EXPECT_EQ("[\"foo\",\"bar\"]", Convert(list, list_schema));
 | 
| -  EXPECT_EQ("[\"baz\",\"blurp\"]",
 | 
| -            Convert(new StringValue("[\"baz\", \"blurp\"]"), list_schema));
 | 
| -  EXPECT_EQ("\"hurz\"", Convert(new StringValue("hurz"), list_schema));
 | 
| -  EXPECT_EQ("19", Convert(new FundamentalValue(19), list_schema));
 | 
| -}
 | 
| -
 | 
| -TEST_F(PolicyManagerTest, ConvertToDictionaryValue) {
 | 
| -  policy::Schema dict_schema = schema_.GetKnownProperty("dict");
 | 
| -  ASSERT_TRUE(dict_schema.valid());
 | 
| -
 | 
| -  DictionaryValue* dict = new DictionaryValue;
 | 
| -  dict->SetInteger("thx", 1138);
 | 
| -  EXPECT_EQ("{\"thx\":1138}", Convert(dict, dict_schema));
 | 
| -  EXPECT_EQ("{\"moose\":true}",
 | 
| -            Convert(new StringValue("{\"moose\": true}"), dict_schema));
 | 
| -  EXPECT_EQ("\"fnord\"", Convert(new StringValue("fnord"), dict_schema));
 | 
| -  EXPECT_EQ("1729", Convert(new FundamentalValue(1729), dict_schema));
 | 
| -}
 | 
| 
 |