Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae

2 files changed, 43 insertions, 0 deletions

diff --git a/components/rappor/BUILD.gn b/components/rappor/BUILD.gn
new file mode 100644
index 0000000000..3127aba00e
--- /dev/null
+++ b/components/rappor/BUILD.gn
@@ -0,0 +1,32 @@
+# Copyright 2014 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.
+
+static_library("rappor") {
+  sources = [
+    "bloom_filter.cc",
+    "bloom_filter.h",
+    "byte_vector_utils.cc",
+    "byte_vector_utils.h",
+    "log_uploader.cc",
+    "log_uploader.h",
+    "rappor_metric.cc",
+    "rappor_metric.h",
+    "rappor_parameters.cc",
+    "rappor_parameters.h",
+    "rappor_pref_names.cc",
+    "rappor_pref_names.h",
+    "rappor_service.cc",
+    "rappor_service.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/metrics",
+    "//components/rappor/proto",
+    "//components/variations",
+    "//crypto",
+    "//net",
+    "//third_party/smhasher:cityhash",
+  ]
+}
diff --git a/components/rappor/proto/BUILD.gn b/components/rappor/proto/BUILD.gn
new file mode 100644
index 0000000000..7b11a2c87b
--- /dev/null
+++ b/components/rappor/proto/BUILD.gn
@@ -0,0 +1,11 @@
+# Copyright 2014 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.
+
+import("//third_party/protobuf/proto_library.gni")
+
+proto_library("proto") {
+  sources = [
+    "rappor_metric.proto",
+  ]
+}