Move //chrome/common/metrics/proto to //chrome/browser/metrics/variations/proto.

BUG=385920
TEST=None
R=isherman@chromium.org,thestig@chromium.org

Review URL: https://codereview.chromium.org/334273003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280737 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 20 insertions, 27 deletions

diff --git a/chrome/common/metrics/proto/BUILD.gn b/chrome/browser/metrics/variations/proto/BUILD.gn
index 309e37b..732e86f 100644
--- a/chrome/common/metrics/proto/BUILD.gn
+++ b/chrome/browser/metrics/variations/proto/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//third_party/protobuf/proto_library.gni")
 
-# GYP version: chrome/chrome_common.gypi:metrics_proto
+# GYP version: chrome/chrome_browser.gypi:variations_proto
 proto_library("proto") {
   sources = [
     "chrome_experiments.proto",
diff --git a/chrome/common/metrics/proto/chrome_experiments.proto b/chrome/browser/metrics/variations/proto/chrome_experiments.proto
index fc46d33..28bf22d 100644
--- a/chrome/common/metrics/proto/chrome_experiments.proto
+++ b/chrome/browser/metrics/variations/proto/chrome_experiments.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 //
diff --git a/chrome/browser/metrics/variations/variations_http_header_provider.cc b/chrome/browser/metrics/variations/variations_http_header_provider.cc
index 07ea7c6..d45c1c4 100644
--- a/chrome/browser/metrics/variations/variations_http_header_provider.cc
+++ b/chrome/browser/metrics/variations/variations_http_header_provider.cc
@@ -12,7 +12,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
-#include "chrome/common/metrics/proto/chrome_experiments.pb.h"
+#include "chrome/browser/metrics/variations/proto/chrome_experiments.pb.h"
 #include "components/google/core/browser/google_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/http/http_request_headers.h"
diff --git a/chrome/browser/metrics/variations/variations_http_header_provider_unittest.cc b/chrome/browser/metrics/variations/variations_http_header_provider_unittest.cc
index 4490f8d..2e644c4 100644
--- a/chrome/browser/metrics/variations/variations_http_header_provider_unittest.cc
+++ b/chrome/browser/metrics/variations/variations_http_header_provider_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
-#include "chrome/common/metrics/proto/chrome_experiments.pb.h"
+#include "chrome/browser/metrics/variations/proto/chrome_experiments.pb.h"
 #include "components/variations/entropy_provider.h"
 #include "components/variations/variations_associated_data.h"
 #include "net/http/http_request_headers.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5e37bda..d772cad 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2829,6 +2829,7 @@
         'in_memory_url_index_cache_proto',
         'probe_message_proto',
         'suggestions_proto',
+        'variations_proto',
         '../components/components.gyp:autocomplete',
         '../components/components.gyp:autofill_core_browser',
         '../components/components.gyp:bookmarks_browser',
@@ -3392,6 +3393,21 @@
       ],
     },
     {
+      # Protobuf compiler / generator for UMA (User Metrics Analysis).
+
+      # GN version: //chrome/browser/metrics/variations/proto:proto
+      'target_name': 'variations_proto',
+      'type': 'static_library',
+      'sources': [
+        'browser/metrics/variations/proto/chrome_experiments.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'browser/metrics/variations/proto',
+        'proto_out_dir': 'chrome/browser/metrics/variations/proto',
+      },
+      'includes': [ '../build/protoc.gypi' ],
+    },
+    {
       # Protobuf compiler / generator for the fraudulent certificate reporting
       # protocol buffer.
       'target_name': 'cert_logger_proto',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2a051e0..a68afe3 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -288,7 +288,6 @@
         'common_net',
         'common_version',
         'installer_util',
-        'metrics_proto',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base_prefs',
@@ -513,7 +512,6 @@
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
-        'metrics_proto',
       ],
     },
     {
@@ -674,20 +672,5 @@
       },
       'includes': [ '../build/protoc.gypi' ],
     },
-    {
-      # Protobuf compiler / generator for UMA (User Metrics Analysis).
-
-      # GN version: //chrome/common/metrics/proto:proto
-      'target_name': 'metrics_proto',
-      'type': 'static_library',
-      'sources': [
-        'common/metrics/proto/chrome_experiments.proto',
-      ],
-      'variables': {
-        'proto_in_dir': 'common/metrics/proto',
-        'proto_out_dir': 'chrome/common/metrics/proto',
-      },
-      'includes': [ '../build/protoc.gypi' ],
-    },
   ],
 }
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 2b74304..7f9538c 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -39,7 +39,6 @@ static_library("common") {
     "//chrome:strings",
     "//chrome/app/theme:theme_resources",
     "//chrome/common:constants",
-    "//chrome/common/metrics/proto",
     "//chrome/common/net",
     #"//components/cloud_devices:common",  TODO(GYP)
     #"//components/json_schema",  TODO(GYP)
diff --git a/chrome/common/metrics/OWNERS b/chrome/common/metrics/OWNERS
deleted file mode 100644
index e4af470..0000000
--- a/chrome/common/metrics/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-isherman@chromium.org
-jar@chromium.org
-asvitkine@chromium.org
-stevet@chromium.org
-mpearson@chromium.org