Revert 197960 "[chromeos] Remove dependencies of StatisticsProvi..."

> [chromeos] Remove dependencies of StatisticsProvider on chrome.
> 
> BUG=180711
> R=davemoore@google.com
> 
> Review URL: https://codereview.chromium.org/14643006

TBR=phajdan.jr@chromium.org

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

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

10 files changed, 0 insertions, 536 deletions

diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser.cc b/chromeos/app_mode/kiosk_oem_manifest_parser.cc
deleted file mode 100644
index c51296f..0000000
--- a/chromeos/app_mode/kiosk_oem_manifest_parser.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "chromeos/app_mode/kiosk_oem_manifest_parser.h"
-
-#include "base/json/json_file_value_serializer.h"
-#include "base/stringprintf.h"
-#include "base/values.h"
-
-namespace chromeos {
-
-namespace {
-
-const char kEnterpriseManaged[]  = "enterprise_managed";
-const char kAllowReset[]         = "can_exit_enrollment";
-const char kDeviceRequisition[]  = "device_requisition";
-const char kKeyboardDrivenOobe[] = "keyboard_driven_oobe";
-
-}  // namespace
-
-KioskOemManifestParser::Manifest::Manifest()
-    : enterprise_managed(false),
-      can_exit_enrollment(true),
-      keyboard_driven_oobe(false) {
-}
-
-bool KioskOemManifestParser::Load(
-    const base::FilePath& kiosk_oem_file,
-    KioskOemManifestParser::Manifest* manifest) {
-  int error_code = JSONFileValueSerializer::JSON_NO_ERROR;
-  std::string error_msg;
-  scoped_ptr<JSONFileValueSerializer> serializer(
-     new JSONFileValueSerializer(kiosk_oem_file));
-  scoped_ptr<base::Value> value(
-      serializer->Deserialize(&error_code, &error_msg));
-  base::DictionaryValue* dict = NULL;
-  if (error_code != JSONFileValueSerializer::JSON_NO_ERROR ||
-      !value.get() ||
-      !value->GetAsDictionary(&dict)) {
-    return false;
-  }
-
-  dict->GetString(kDeviceRequisition,
-                  &manifest->device_requisition);
-  dict->GetBoolean(kKeyboardDrivenOobe,
-                   &manifest->keyboard_driven_oobe);
-  if (!dict->GetBoolean(kEnterpriseManaged,
-                        &manifest->enterprise_managed) ||
-      !dict->GetBoolean(kAllowReset,
-                        &manifest->can_exit_enrollment)) {
-    return false;
-  }
-
-  return true;
-}
-
-}  // namespace chromeos
diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser.h b/chromeos/app_mode/kiosk_oem_manifest_parser.h
deleted file mode 100644
index 05b7e0a..0000000
--- a/chromeos/app_mode/kiosk_oem_manifest_parser.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
-#define CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
-
-#include <string>
-
-#include "base/files/file_path.h"
-#include "chromeos/chromeos_export.h"
-
-namespace chromeos {
-
-// Parser for app kiosk OEM manifest files.
-class CHROMEOS_EXPORT KioskOemManifestParser {
- public:
-  // Kiosk OEM manifest.
-  struct Manifest {
-    Manifest();
-
-    // True if OOBE flow should enforce enterprise enrollment.
-    bool enterprise_managed;
-    // True user can exit enterprise enrollment during OOBE.
-    bool can_exit_enrollment;
-    // Intended purpose of the device. Meant to be pass-through value for
-    // enterprise enrollment.
-    std::string device_requisition;
-    // True if OOBE flow should be adapted for keyboard flow.
-    bool keyboard_driven_oobe;
-  };
-
-  // Loads manifest from |kiosk_oem_file|. Returns true if manifest was
-  // found and successfully parsed.
-  static bool Load(const base::FilePath& kiosk_oem_file,
-                   Manifest* manifest);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(KioskOemManifestParser);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROMEOS_APP_MODE_KIOSK_OEM_MANIFEST_PARSER_H_
diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc b/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc
deleted file mode 100644
index 246a797..0000000
--- a/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "chromeos/app_mode/kiosk_oem_manifest_parser.h"
-
-#include "base/path_service.h"
-#include "chromeos/chromeos_test_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace chromeos {
-
-typedef testing::Test KioskOemManifestParserTest;
-
-TEST_F(KioskOemManifestParserTest, LoadTest) {
-  base::FilePath test_data_dir;
-  ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
-                  "app_mode", "kiosk_manifest", &test_data_dir));
-  base::FilePath kiosk_oem_file =
-      test_data_dir.AppendASCII("kiosk_manifest.json");
-  KioskOemManifestParser::Manifest manifest;
-  EXPECT_TRUE(KioskOemManifestParser::Load(kiosk_oem_file, &manifest));
-  EXPECT_TRUE(manifest.enterprise_managed);
-  EXPECT_FALSE(manifest.can_exit_enrollment);
-  EXPECT_TRUE(manifest.keyboard_driven_oobe);
-  EXPECT_EQ(manifest.device_requisition, std::string("test"));
-}
-
-}  // namespace chromeos
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 62a276a..251bbfe 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -30,8 +30,6 @@
         'CHROMEOS_IMPLEMENTATION',
       ],
       'sources': [
-        'app_mode/kiosk_oem_manifest_parser.cc',
-        'app_mode/kiosk_oem_manifest_parser.h',
         'audio/audio_device.cc',
         'audio/audio_device.h',
         'audio/audio_pref_observer.h',
@@ -46,8 +44,6 @@
         'attestation/attestation_constants.h',
         'attestation/attestation_flow.cc',
         'attestation/attestation_flow.h',
-        'chromeos_constants.cc',
-        'chromeos_constants.h',
         'chromeos_export.h',
         'chromeos_paths.cc',
         'chromeos_paths.h',
@@ -296,8 +292,6 @@
         'process_proxy/process_proxy.h',
         'process_proxy/process_proxy_registry.cc',
         'process_proxy/process_proxy_registry.h',
-        'system/name_value_pairs_parser.cc',
-        'system/name_value_pairs_parser.h',
       ],
       'conditions': [
         ['use_x11 == 1', {
@@ -472,7 +466,6 @@
       ],
       'sources': [
         'attestation/attestation_flow_unittest.cc',
-        'app_mode/kiosk_oem_manifest_parser_unittest.cc',
         'display/output_configurator_unittest.cc',
         'dbus/blocking_method_caller_unittest.cc',
         'dbus/power_policy_controller_unittest.cc',
@@ -525,7 +518,6 @@
         'network/shill_property_handler_unittest.cc',
         'process_proxy/process_output_watcher_unittest.cc',
         'process_proxy/process_proxy_unittest.cc',
-        'system/name_value_pairs_parser_unittest.cc',
       ],
       'include_dirs': [
         '..',
diff --git a/chromeos/chromeos_constants.cc b/chromeos/chromeos_constants.cc
deleted file mode 100644
index fb2b8a3..0000000
--- a/chromeos/chromeos_constants.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 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.
-
-#include "chromeos/chromeos_constants.h"
-
-#define FPL FILE_PATH_LITERAL
-
-namespace chromeos {
-
-const base::FilePath::CharType kDriveCacheDirname[] = FPL("GCache");
-const char kOemDeviceRequisitionKey[] = "oem_device_requisition";
-const char kOemIsEnterpriseManagedKey[] = "oem_enterprise_managed";
-const char kOemCanExitEnterpriseEnrollmentKey[] = "oem_can_exit_enrollment";
-const char kOemKeyboardDrivenOobeKey[] = "oem_keyboard_driven_oobe";
-
-}  // namespace chromeos
diff --git a/chromeos/chromeos_constants.h b/chromeos/chromeos_constants.h
deleted file mode 100644
index 48e0e9df..0000000
--- a/chromeos/chromeos_constants.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 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.
-
-// Constants related to ChromeOS.
-
-#ifndef CHROMEOS_CHROMEOS_CONSTANTS_H_
-#define CHROMEOS_CHROMEOS_CONSTANTS_H_
-
-#include "base/files/file_path.h"
-#include "chromeos/chromeos_export.h"
-
-namespace chromeos {
-
-CHROMEOS_EXPORT extern const base::FilePath::CharType kDriveCacheDirname[];
-CHROMEOS_EXPORT extern const char kOemDeviceRequisitionKey[];
-CHROMEOS_EXPORT extern const char kOemIsEnterpriseManagedKey[];
-CHROMEOS_EXPORT extern const char kOemCanExitEnterpriseEnrollmentKey[];
-CHROMEOS_EXPORT extern const char kOemKeyboardDrivenOobeKey[];
-
-}  // namespace chromeos
-
-#endif  // CHROMEOS_CHROMEOS_CONSTANTS_H_
diff --git a/chromeos/system/name_value_pairs_parser.cc b/chromeos/system/name_value_pairs_parser.cc
deleted file mode 100644
index df65d50..0000000
--- a/chromeos/system/name_value_pairs_parser.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "chromeos/system/name_value_pairs_parser.h"
-
-#include "base/command_line.h"
-#include "base/file_util.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "base/process_util.h"
-#include "base/stl_util.h"
-#include "base/string_util.h"
-#include "base/strings/string_tokenizer.h"
-
-namespace chromeos {  // NOLINT
-namespace system {
-
-namespace {
-
-const char kQuoteChars[] = "\"";
-const char kTrimChars[] = "\" ";
-
-bool GetToolOutput(int argc, const char* argv[], std::string& output) {
-  DCHECK_GE(argc, 1);
-
-  if (!file_util::PathExists(base::FilePath(argv[0]))) {
-    LOG(WARNING) << "Tool for statistics not found: " << argv[0];
-    return false;
-  }
-
-  std::vector<std::string> args;
-  for (int argn = 0; argn < argc; ++argn)
-    args.push_back(argv[argn]);
-  if (!base::GetAppOutput(args, &output)) {
-    LOG(WARNING) << "Error executing " << argv[0];
-    return false;
-  }
-
-  return true;
-}
-
-}  // namespace
-
-NameValuePairsParser::NameValuePairsParser(NameValueMap* map)
-    : map_(map) {
-}
-
-void NameValuePairsParser::AddNameValuePair(const std::string& key,
-                                            const std::string& value) {
-  if (!ContainsKey(*map_, key)) {
-    (*map_)[key] = value;
-    VLOG(1) << "name: " << key << ", value: " << value;
-  } else {
-    LOG(WARNING) << "Key " << key << " already has value " << (*map_)[key]
-                 << ", ignoring new value: " << value;
-  }
-}
-
-bool NameValuePairsParser::ParseNameValuePairs(const std::string& in_string,
-                                               const std::string& eq,
-                                               const std::string& delim) {
-  return ParseNameValuePairsWithComments(in_string, eq, delim, "");
-}
-
-bool NameValuePairsParser::ParseNameValuePairsWithComments(
-    const std::string& in_string,
-    const std::string& eq,
-    const std::string& delim,
-    const std::string& comment_delim) {
-  bool all_valid = true;
-  // Set up the pair tokenizer.
-  base::StringTokenizer pair_toks(in_string, delim);
-  pair_toks.set_quote_chars(kQuoteChars);
-  // Process token pairs.
-  while (pair_toks.GetNext()) {
-    std::string pair(pair_toks.token());
-    // Anything before the first |eq| is the key, anything after is the value.
-    // |eq| must exist.
-    size_t eq_pos = pair.find(eq);
-    if (eq_pos != std::string::npos) {
-      // First |comment_delim| after |eq_pos| starts the comment.
-      // A value of |std::string::npos| means that the value spans to the end
-      // of |pair|.
-      size_t value_size = std::string::npos;
-      if (!comment_delim.empty()) {
-        size_t comment_pos = pair.find(comment_delim, eq_pos + 1);
-        if (comment_pos != std::string::npos)
-          value_size = comment_pos - eq_pos - 1;
-      }
-
-      std::string key;
-      std::string value;
-      TrimString(pair.substr(0, eq_pos), kTrimChars, &key);
-      TrimString(pair.substr(eq_pos + 1, value_size), kTrimChars, &value);
-
-      if (!key.empty()) {
-        AddNameValuePair(key, value);
-        continue;
-      }
-    }
-
-    LOG(WARNING) << "Invalid token pair: " << pair << ". Ignoring.";
-    all_valid = false;
-  }
-  return all_valid;
-}
-
-bool NameValuePairsParser::GetSingleValueFromTool(int argc,
-                                                  const char* argv[],
-                                                  const std::string& key) {
-  std::string output_string;
-  if (!GetToolOutput(argc, argv, output_string))
-    return false;
-
-  TrimWhitespaceASCII(output_string, TRIM_ALL, &output_string);
-  AddNameValuePair(key, output_string);
-  return true;
-}
-
-bool NameValuePairsParser::GetNameValuePairsFromFile(
-    const base::FilePath& file_path,
-    const std::string& eq,
-    const std::string& delim) {
-  std::string contents;
-  if (file_util::ReadFileToString(file_path, &contents)) {
-    return ParseNameValuePairs(contents, eq, delim);
-  } else {
-    LOG(WARNING) << "Unable to read statistics file: " << file_path.value();
-    return false;
-  }
-}
-
-bool NameValuePairsParser::ParseNameValuePairsFromTool(
-    int argc,
-    const char* argv[],
-    const std::string& eq,
-    const std::string& delim,
-    const std::string& comment_delim) {
-  std::string output_string;
-  if (!GetToolOutput(argc, argv, output_string))
-    return false;
-
-  return ParseNameValuePairsWithComments(
-      output_string, eq, delim, comment_delim);
-}
-
-}  // namespace system
-}  // namespace chromeos
diff --git a/chromeos/system/name_value_pairs_parser.h b/chromeos/system/name_value_pairs_parser.h
deleted file mode 100644
index 2cb704b..0000000
--- a/chromeos/system/name_value_pairs_parser.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
-#define CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
-
-#include <map>
-#include <string>
-
-#include "base/basictypes.h"
-#include "chromeos/chromeos_export.h"
-
-namespace base {
-class FilePath;
-}
-
-namespace chromeos {
-namespace system {
-
-// The parser is used to get machine info as name-value pairs. Defined
-// here to be accessible by tests.
-class CHROMEOS_EXPORT NameValuePairsParser {
- public:
-  typedef std::map<std::string, std::string> NameValueMap;
-
-  // The obtained info will be written into the given map.
-  explicit NameValuePairsParser(NameValueMap* map);
-
-  void AddNameValuePair(const std::string& key, const std::string& value);
-
-  // Executes tool and inserts (key, <output>) into map_.
-  // The program name (argv[0]) should be an absolute path. The function
-  // checks if the program exists before executing it as some programs
-  // don't exist on Linux desktop; returns false in that case.
-  bool GetSingleValueFromTool(int argc, const char* argv[],
-                              const std::string& key);
-
-  // Parses name-value pairs from the file.
-  // Returns false if there was any error in the file. Valid pairs will still be
-  // added to the map.
-  bool GetNameValuePairsFromFile(const base::FilePath& file_path,
-                                 const std::string& eq,
-                                 const std::string& delim);
-
-  // These will parse strings with output in the format:
-  // <key><EQ><value><DELIM>[<key><EQ><value>][...]
-  // e.g. ParseNameValuePairs("key1=value1 key2=value2", "=", " ")
-  // Returns false if there was any error in in_string. Valid pairs will still
-  // be added to the map.
-  bool ParseNameValuePairs(const std::string& in_string,
-                           const std::string& eq,
-                           const std::string& delim);
-
-  // This version allows for values which end with a comment
-  // beginning with comment_delim.
-  // e.g. "key2=value2 # Explanation of value\n"
-  // Returns false if there was any error in in_string. Valid pairs will still
-  // be added to the map.
-  bool ParseNameValuePairsWithComments(const std::string& in_string,
-                                       const std::string& eq,
-                                       const std::string& delim,
-                                       const std::string& comment_delim);
-
-  // Same as ParseNameValuePairsWithComments(), but uses the output of the given
-  // tool as the input to parse.
-  bool ParseNameValuePairsFromTool(
-      int argc,
-      const char* argv[],
-      const std::string& eq,
-      const std::string& delim,
-      const std::string& comment_delim);
-
- private:
-  NameValueMap* map_;
-
-  DISALLOW_COPY_AND_ASSIGN(NameValuePairsParser);
-};
-
-}  // namespace system
-}  // namespace chromeos
-
-#endif  // CHROMEOS_SYSTEM_NAME_VALUE_PAIRS_PARSER_H_
diff --git a/chromeos/system/name_value_pairs_parser_unittest.cc b/chromeos/system/name_value_pairs_parser_unittest.cc
deleted file mode 100644
index e627521..0000000
--- a/chromeos/system/name_value_pairs_parser_unittest.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "chromeos/system/name_value_pairs_parser.h"
-
-#include "base/basictypes.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace chromeos {
-namespace system {
-
-TEST(NameValuePairsParser, TestGetSingleValueFromTool) {
-  NameValuePairsParser::NameValueMap map;
-  NameValuePairsParser parser(&map);
-  const char* command[] = { "/bin/echo", "Foo" };
-  EXPECT_TRUE(parser.GetSingleValueFromTool(arraysize(command), command,
-                                            "foo"));
-  ASSERT_EQ(1U, map.size());
-  EXPECT_EQ("Foo", map["foo"]);
-}
-
-TEST(NameValuePairsParser, TestParseNameValuePairs) {
-  NameValuePairsParser::NameValueMap map;
-  NameValuePairsParser parser(&map);
-  const std::string contents1 = "foo=Foo bar=Bar\nfoobar=FooBar\n";
-  EXPECT_TRUE(parser.ParseNameValuePairs(contents1, "=", " \n"));
-  EXPECT_EQ(3U, map.size());
-  EXPECT_EQ("Foo", map["foo"]);
-  EXPECT_EQ("Bar", map["bar"]);
-  EXPECT_EQ("FooBar", map["foobar"]);
-
-  map.clear();
-  const std::string contents2 = "foo=Foo,bar=Bar";
-  EXPECT_TRUE(parser.ParseNameValuePairs(contents2, "=", ",\n"));
-  EXPECT_EQ(2U, map.size());
-  EXPECT_EQ("Foo", map["foo"]);
-  EXPECT_EQ("Bar", map["bar"]);
-
-  map.clear();
-  const std::string contents3 = "foo=Foo=foo,bar=Bar";
-  EXPECT_TRUE(parser.ParseNameValuePairs(contents3, "=", ",\n"));
-  EXPECT_EQ(2U, map.size());
-  EXPECT_EQ("Foo=foo", map["foo"]);
-  EXPECT_EQ("Bar", map["bar"]);
-
-  map.clear();
-  const std::string contents4 = "foo=Foo,=Bar";
-  EXPECT_FALSE(parser.ParseNameValuePairs(contents4, "=", ",\n"));
-  EXPECT_EQ(1U, map.size());
-  EXPECT_EQ("Foo", map["foo"]);
-
-  map.clear();
-  const std::string contents5 =
-      "\"initial_locale\"=\"ja\"\n"
-      "\"initial_timezone\"=\"Asia/Tokyo\"\n"
-      "\"keyboard_layout\"=\"mozc-jp\"\n";
-  EXPECT_TRUE(parser.ParseNameValuePairs(contents5, "=", "\n"));
-  EXPECT_EQ(3U, map.size());
-  EXPECT_EQ("ja", map["initial_locale"]);
-  EXPECT_EQ("Asia/Tokyo", map["initial_timezone"]);
-  EXPECT_EQ("mozc-jp", map["keyboard_layout"]);
-}
-
-TEST(NameValuePairsParser, TestParseNameValuePairsWithComments) {
-  NameValuePairsParser::NameValueMap map;
-  NameValuePairsParser parser(&map);
-
-  const std::string contents1 = "foo=Foo,bar=#Bar,baz= 0 #Baz";
-  EXPECT_TRUE(parser.ParseNameValuePairsWithComments(
-      contents1, "=", ",\n", "#"));
-  EXPECT_EQ(3U, map.size());
-  EXPECT_EQ("Foo", map["foo"]);
-  EXPECT_EQ("", map["bar"]);
-  EXPECT_EQ("0", map["baz"]);
-
-  map.clear();
-  const std::string contents2 = "foo=";
-  EXPECT_TRUE(parser.ParseNameValuePairsWithComments(
-      contents2, "=", ",\n", "#"));
-  EXPECT_EQ(1U, map.size());
-  EXPECT_EQ("", map["foo"]);
-
-  map.clear();
-  const std::string contents3 = " \t ,,#all empty,";
-  EXPECT_FALSE(parser.ParseNameValuePairsWithComments(
-      contents3, "=", ",\n", "#"));
-  EXPECT_EQ(0U, map.size());
-}
-
-TEST(NameValuePairsParser, TestParseNameValuePairsFromTool) {
-  // Sample output is taken from the /usr/bin/crosssytem tool.
-  const char* command[] = { "/bin/echo",
-    "arch                   = x86           # Platform architecture\n" \
-    "cros_debug             = 1             # OS should allow debug\n" \
-    "dbg_reset              = (error)       # Debug reset mode request\n" \
-    "key#with_comment       = some value    # Multiple # comment # delims\n" \
-    "key                    =               # No value.\n" \
-    "vdat_timers            = " \
-        "LFS=0,0 LF=1784220250,2971030570 LK=9064076660,9342689170 " \
-        "# Timer values from VbSharedData\n"
-  };
-
-  NameValuePairsParser::NameValueMap map;
-  NameValuePairsParser parser(&map);
-  parser.ParseNameValuePairsFromTool(
-      arraysize(command), command, "=", "\n", "#");
-  EXPECT_EQ(6u, map.size());
-  EXPECT_EQ("x86", map["arch"]);
-  EXPECT_EQ("1", map["cros_debug"]);
-  EXPECT_EQ("(error)", map["dbg_reset"]);
-  EXPECT_EQ("some value", map["key#with_comment"]);
-  EXPECT_EQ("", map["key"]);
-  EXPECT_EQ("LFS=0,0 LF=1784220250,2971030570 LK=9064076660,9342689170",
-            map["vdat_timers"]);
-}
-
-}  // namespace system
-}  // namespace chromeos
diff --git a/chromeos/test/data/app_mode/kiosk_manifest/kiosk_manifest.json b/chromeos/test/data/app_mode/kiosk_manifest/kiosk_manifest.json
deleted file mode 100644
index a3f5c562..0000000
--- a/chromeos/test/data/app_mode/kiosk_manifest/kiosk_manifest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "enterprise_managed": true,
-  "can_exit_enrollment": false,
-  "keyboard_driven_oobe": true,
-  "device_requisition": "test"
-}