Moves components/metrics/chromeos to c/m/serialization/.

This allows other clients to use the external serialization utils.

R=bsimonnet@chromium.org,isherman@chromium.org,asvitkine@chromium.org
BUG=343624

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

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

7 files changed, 35 insertions, 35 deletions

diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 996fcef..242356c7 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -559,19 +559,19 @@
               ],
             }],
             ['chromeos==1', {
-              'sources': [
-                'metrics/chromeos/serialization_utils_unittest.cc',
-              ],
               'sources!': [
                 'storage_monitor/storage_monitor_linux_unittest.cc',
               ],
               'dependencies': [
                 '../chromeos/chromeos.gyp:chromeos_test_support',
-                'components.gyp:metrics_chromeos',
               ],
             }],
             ['OS=="linux"', {
+              'sources': [
+                'metrics/serialization/serialization_utils_unittest.cc',
+              ],
               'dependencies': [
+                'components.gyp:metrics_serialization',
                 '../dbus/dbus.gyp:dbus',
                 '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
               ],
diff --git a/components/metrics.gypi b/components/metrics.gypi
index f3dc749..964e4fa 100644
--- a/components/metrics.gypi
+++ b/components/metrics.gypi
@@ -53,7 +53,7 @@
       'conditions': [
         ['chromeos==1', {
           'dependencies': [
-            'metrics_chromeos',
+            'metrics_serialization',
           ],
         }],
         ['OS=="win"', {
@@ -125,16 +125,16 @@
     },
   ],
   'conditions': [
-    ['chromeos==1', {
+    ['OS=="linux"', {
       'targets': [
         {
-          'target_name': 'metrics_chromeos',
+          'target_name': 'metrics_serialization',
           'type': 'static_library',
           'sources': [
-            'metrics/chromeos/serialization_utils.cc',
-            'metrics/chromeos/serialization_utils.h',
-            'metrics/chromeos/metric_sample.cc',
-            'metrics/chromeos/metric_sample.h',
+            'metrics/serialization/serialization_utils.cc',
+            'metrics/serialization/serialization_utils.h',
+            'metrics/serialization/metric_sample.cc',
+            'metrics/serialization/metric_sample.h',
           ],
           'dependencies': [
             '../base/base.gyp:base',
diff --git a/components/metrics/chromeos/metric_sample.cc b/components/metrics/serialization/metric_sample.cc
index 9e8ff22..5d7d1fc 100644
--- a/components/metrics/chromeos/metric_sample.cc
+++ b/components/metrics/serialization/metric_sample.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 "components/metrics/chromeos/metric_sample.h"
+#include "components/metrics/serialization/metric_sample.h"
 
 #include <string>
 #include <vector>
diff --git a/components/metrics/chromeos/metric_sample.h b/components/metrics/serialization/metric_sample.h
index 06358e4..8784abb 100644
--- a/components/metrics/chromeos/metric_sample.h
+++ b/components/metrics/serialization/metric_sample.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 COMPONENTS_METRICS_CHROMEOS_METRIC_SAMPLE_H_
-#define COMPONENTS_METRICS_CHROMEOS_METRIC_SAMPLE_H_
+#ifndef COMPONENTS_METRICS_SERIALIZATION_METRIC_SAMPLE_H_
+#define COMPONENTS_METRICS_SERIALIZATION_METRIC_SAMPLE_H_
 
 #include <string>
 
@@ -116,4 +116,4 @@ class MetricSample {
 
 }  // namespace metrics
 
-#endif  // COMPONENTS_METRICS_CHROMEOS_METRIC_SAMPLE_H_
+#endif  // COMPONENTS_METRICS_SERIALIZATION_METRIC_SAMPLE_H_
diff --git a/components/metrics/chromeos/serialization_utils.cc b/components/metrics/serialization/serialization_utils.cc
index adfadc5..6e0be26 100644
--- a/components/metrics/chromeos/serialization_utils.cc
+++ b/components/metrics/serialization/serialization_utils.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 "components/metrics/chromeos/serialization_utils.h"
+#include "components/metrics/serialization/serialization_utils.h"
 
 #include <sys/file.h>
 
@@ -17,7 +17,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
-#include "components/metrics/chromeos/metric_sample.h"
+#include "components/metrics/serialization/metric_sample.h"
 
 #define READ_WRITE_ALL_FILE_FLAGS \
   (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
diff --git a/components/metrics/chromeos/serialization_utils.h b/components/metrics/serialization/serialization_utils.h
index 1fb27bc..17e5e4c 100644
--- a/components/metrics/chromeos/serialization_utils.h
+++ b/components/metrics/serialization/serialization_utils.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 COMPONENTS_METRICS_CHROMEOS_SERIALIZATION_UTILS_H_
-#define COMPONENTS_METRICS_CHROMEOS_SERIALIZATION_UTILS_H_
+#ifndef COMPONENTS_METRICS_SERIALIZATION_SERIALIZATION_UTILS_H_
+#define COMPONENTS_METRICS_SERIALIZATION_SERIALIZATION_UTILS_H_
 
 #include <string>
 
@@ -45,4 +45,4 @@ static const int kMessageMaxLength = 1024;
 }  // namespace SerializationUtils
 }  // namespace metrics
 
-#endif  // COMPONENTS_METRICS_CHROMEOS_SERIALIZATION_UTILS_H_
+#endif  // COMPONENTS_METRICS_SERIALIZATION_SERIALIZATION_UTILS_H_
diff --git a/components/metrics/chromeos/serialization_utils_unittest.cc b/components/metrics/serialization/serialization_utils_unittest.cc
index 5ed7379..5a080ae 100644
--- a/components/metrics/chromeos/serialization_utils_unittest.cc
+++ b/components/metrics/serialization/serialization_utils_unittest.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/metrics/chromeos/serialization_utils.h"
+#include "components/metrics/serialization/serialization_utils.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "components/metrics/chromeos/metric_sample.h"
+#include "components/metrics/serialization/metric_sample.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace metrics {
 namespace {
 
-class SerializationUtilsChromeOSTest : public testing::Test {
+class SerializationUtilsTest : public testing::Test {
  protected:
-  SerializationUtilsChromeOSTest() {
+  SerializationUtilsTest() {
     bool success = temporary_dir.CreateUniqueTempDir();
     if (success) {
       base::FilePath dir_path = temporary_dir.path();
@@ -43,29 +43,29 @@ class SerializationUtilsChromeOSTest : public testing::Test {
   base::FilePath filepath;
 };
 
-TEST_F(SerializationUtilsChromeOSTest, CrashSerializeTest) {
+TEST_F(SerializationUtilsTest, CrashSerializeTest) {
   TestSerialization(MetricSample::CrashSample("test").get());
 }
 
-TEST_F(SerializationUtilsChromeOSTest, HistogramSerializeTest) {
+TEST_F(SerializationUtilsTest, HistogramSerializeTest) {
   TestSerialization(
       MetricSample::HistogramSample("myhist", 13, 1, 100, 10).get());
 }
 
-TEST_F(SerializationUtilsChromeOSTest, LinearSerializeTest) {
+TEST_F(SerializationUtilsTest, LinearSerializeTest) {
   TestSerialization(
       MetricSample::LinearHistogramSample("linearhist", 12, 30).get());
 }
 
-TEST_F(SerializationUtilsChromeOSTest, SparseSerializeTest) {
+TEST_F(SerializationUtilsTest, SparseSerializeTest) {
   TestSerialization(MetricSample::SparseHistogramSample("mysparse", 30).get());
 }
 
-TEST_F(SerializationUtilsChromeOSTest, UserActionSerializeTest) {
+TEST_F(SerializationUtilsTest, UserActionSerializeTest) {
   TestSerialization(MetricSample::UserActionSample("myaction").get());
 }
 
-TEST_F(SerializationUtilsChromeOSTest, IllegalNameAreFilteredTest) {
+TEST_F(SerializationUtilsTest, IllegalNameAreFilteredTest) {
   scoped_ptr<MetricSample> sample1 =
       MetricSample::SparseHistogramSample("no space", 10);
   scoped_ptr<MetricSample> sample2 = MetricSample::LinearHistogramSample(
@@ -80,13 +80,13 @@ TEST_F(SerializationUtilsChromeOSTest, IllegalNameAreFilteredTest) {
   EXPECT_EQ(0, size);
 }
 
-TEST_F(SerializationUtilsChromeOSTest, BadInputIsCaughtTest) {
+TEST_F(SerializationUtilsTest, BadInputIsCaughtTest) {
   std::string input(
       base::StringPrintf("sparsehistogram%cname foo%c", '\0', '\0'));
   EXPECT_EQ(NULL, MetricSample::ParseSparseHistogram(input).get());
 }
 
-TEST_F(SerializationUtilsChromeOSTest, MessageSeparatedByZero) {
+TEST_F(SerializationUtilsTest, MessageSeparatedByZero) {
   scoped_ptr<MetricSample> crash = MetricSample::CrashSample("mycrash");
 
   SerializationUtils::WriteMetricToFile(*crash.get(), filename);
@@ -100,7 +100,7 @@ TEST_F(SerializationUtilsChromeOSTest, MessageSeparatedByZero) {
   EXPECT_EQ(size, 18);
 }
 
-TEST_F(SerializationUtilsChromeOSTest, MessagesTooLongAreDiscardedTest) {
+TEST_F(SerializationUtilsTest, MessagesTooLongAreDiscardedTest) {
   // Creates a message that is bigger than the maximum allowed size.
   // As we are adding extra character (crash, \0s, etc), if the name is
   // kMessageMaxLength long, it will be too long.
@@ -113,7 +113,7 @@ TEST_F(SerializationUtilsChromeOSTest, MessagesTooLongAreDiscardedTest) {
   EXPECT_EQ(0, size);
 }
 
-TEST_F(SerializationUtilsChromeOSTest, ReadLongMessageTest) {
+TEST_F(SerializationUtilsTest, ReadLongMessageTest) {
   base::File test_file(filepath,
                        base::File::FLAG_OPEN_ALWAYS | base::File::FLAG_APPEND);
   std::string message(SerializationUtils::kMessageMaxLength + 1, 'c');
@@ -134,7 +134,7 @@ TEST_F(SerializationUtilsChromeOSTest, ReadLongMessageTest) {
   EXPECT_TRUE(crash->IsEqual(*samples[0]));
 }
 
-TEST_F(SerializationUtilsChromeOSTest, WriteReadTest) {
+TEST_F(SerializationUtilsTest, WriteReadTest) {
   scoped_ptr<MetricSample> hist =
       MetricSample::HistogramSample("myhist", 1, 2, 3, 4);
   scoped_ptr<MetricSample> crash = MetricSample::CrashSample("mycrash");