Move Variations stuff into variations/ directories and add OWNERS files for the variations client team.

BUG=None
TEST=No user visible changes.
Review URL: https://chromiumcodereview.appspot.com/10828314

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

5 files changed, 12 insertions, 10 deletions

diff --git a/chrome/common/metrics/variations/OWNERS b/chrome/common/metrics/variations/OWNERS
new file mode 100644
index 0000000..9e09a4b
--- /dev/null
+++ b/chrome/common/metrics/variations/OWNERS
@@ -0,0 +1,2 @@
+asvitkine@chromium.org
+stevet@chromium.org
diff --git a/chrome/common/metrics/variation_ids.h b/chrome/common/metrics/variations/variation_ids.h
index 90a1bbf..7baabb1 100644
--- a/chrome/common/metrics/variation_ids.h
+++ b/chrome/common/metrics/variations/variation_ids.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_METRICS_VARIATION_IDS_H_
-#define CHROME_COMMON_METRICS_VARIATION_IDS_H_
+#ifndef CHROME_COMMON_METRICS_VARIATIONS_VARIATION_IDS_H_
+#define CHROME_COMMON_METRICS_VARIATIONS_VARIATION_IDS_H_
 
 namespace chrome_variations {
 
@@ -119,4 +119,4 @@ enum VariationID {
 
 }  // namespace chrome_variations
 
-#endif  // CHROME_COMMON_METRICS_VARIATION_IDS_H_
+#endif  // CHROME_COMMON_METRICS_VARIATIONS_VARIATION_IDS_H_
diff --git a/chrome/common/metrics/variations_util.cc b/chrome/common/metrics/variations/variations_util.cc
index 86d786f..5d09145 100644
--- a/chrome/common/metrics/variations_util.cc
+++ b/chrome/common/metrics/variations/variations_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 
 #include <map>
 #include <vector>
@@ -14,7 +14,7 @@
 #include "base/sys_byteorder.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/child_process_logging.h"
-#include "chrome/common/metrics/variation_ids.h"
+#include "chrome/common/metrics/variations/variation_ids.h"
 
 namespace {
 
diff --git a/chrome/common/metrics/variations_util.h b/chrome/common/metrics/variations/variations_util.h
index 5c72397..5699b60 100644
--- a/chrome/common/metrics/variations_util.h
+++ b/chrome/common/metrics/variations/variations_util.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_METRICS_VARIATIONS_UTIL_H_
-#define CHROME_COMMON_METRICS_VARIATIONS_UTIL_H_
+#ifndef CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_UTIL_H_
+#define CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/metrics/field_trial.h"
 #include "base/string16.h"
-#include "chrome/common/metrics/variation_ids.h"
+#include "chrome/common/metrics/variations/variation_ids.h"
 
 // This namespace provides various helpers that extend the functionality around
 // base::FieldTrial.
@@ -123,4 +123,4 @@ uint32 TestHashName(const std::string& name);
 
 }  // namespace testing
 
-#endif  // CHROME_COMMON_METRICS_VARIATIONS_UTIL_H_
+#endif  // CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_UTIL_H_
diff --git a/chrome/common/metrics/variations_util_unittest.cc b/chrome/common/metrics/variations/variations_util_unittest.cc
index dbe2732..24d8fd4 100644
--- a/chrome/common/metrics/variations_util_unittest.cc
+++ b/chrome/common/metrics/variations/variations_util_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/metrics/field_trial.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"