Convert content_settings.mojom to use mojo/public/mojom/base/values.mojom

This change also converts the minimum necessary amount of C++ code to pass
objects of base::Value by value instead of std::unique_ptr.

TBR=jam@chromium.org

Bug: 646113,799482
Change-Id: Ib216232ea68c225882890eb74356a8a663d38f13
Reviewed-on: https://chromium-review.googlesource.com/1000254
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549591}

components/content_settings/core/common/BUILD.gn

@@ -23,7 +23,7 @@ static_library("common") {
 
   deps = [
     "//base",
-    "//mojo/common:common_custom_types",
+    "//mojo/public/cpp/base",
     "//mojo/public/cpp/bindings:struct_traits",
     "//net",
     "//url",
@@ -52,6 +52,6 @@ mojom("mojo_bindings") {
   ]
 
   public_deps = [
-    "//mojo/common:common_custom_types",
+    "//mojo/public/mojom/base",
   ]
 }

components/content_settings/core/common/DEPS

 include_rules = [
-  "+mojo/common",
+  "+mojo/public/cpp/base",
   "+mojo/public/cpp/bindings",
   "+net/base",
   "+testing",

components/content_settings/core/common/content_settings.mojom

@@ -4,7 +4,7 @@
 
 module content_settings.mojom;
 
-import "mojo/common/values.mojom";
+import "mojo/public/mojom/base/values.mojom";
 
 // This mirrors the C++ type in content_settings_pattern.h.
 struct PatternParts {
@@ -61,7 +61,7 @@ enum ContentSetting {
 struct ContentSettingPatternSource {
   ContentSettingsPattern primary_pattern;
   ContentSettingsPattern secondary_pattern;
-  mojo.common.mojom.Value setting_value;
+  mojo_base.mojom.Value setting_value;
   string source;
   bool incognito;
 };

components/content_settings/core/common/content_settings_struct_traits.cc

@@ -86,9 +86,10 @@ bool StructTraits<content_settings::mojom::ContentSettingPatternSourceDataView,
     Read(content_settings::mojom::ContentSettingPatternSourceDataView data,
          ContentSettingPatternSource* out) {
   out->incognito = data.incognito();
+  out->setting_value = std::make_unique<base::Value>();
   return data.ReadPrimaryPattern(&out->primary_pattern) &&
          data.ReadSecondaryPattern(&out->secondary_pattern) &&
-         data.ReadSettingValue(&out->setting_value) &&
+         data.ReadSettingValue(out->setting_value.get()) &&
          data.ReadSource(&out->source);
 }
 

components/content_settings/core/common/content_settings_struct_traits.h

@@ -11,7 +11,7 @@
 #include "base/values.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings.mojom.h"
-#include "mojo/common/values_struct_traits.h"
+#include "mojo/public/cpp/base/values_mojom_traits.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 
@@ -99,9 +99,9 @@ struct StructTraits<
     return r.secondary_pattern;
   }
 
-  static const std::unique_ptr<base::Value>& setting_value(
+  static const base::Value& setting_value(
       const ContentSettingPatternSource& r) {
-    return r.setting_value;
+    return *r.setting_value;
   }
 
   static const std::string& source(const ContentSettingPatternSource& r) {