This moves the ONC parsing code into chromeos/network/onc

chromeos/network/onc/onc_test_utils.cc

 // 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 "chrome/browser/chromeos/network_settings/onc_test_utils.h"
+#include "chromeos/network/onc/onc_test_utils.h"
 
 #include "base/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/values.h"
-#include "chrome/common/chrome_paths.h"
+#include "chromeos/chromeos_test_utils.h"
 
 namespace chromeos {
 namespace onc {
 namespace test_utils {
 
+namespace {
+
+// The name of the component directory to get the test data from.
+const char kNetworkComponentDirectory[] = "network";
+
+}  // namespace
+
 scoped_ptr<base::DictionaryValue> ReadTestDictionary(
     const std::string& filename) {
+  base::DictionaryValue* dict = NULL;
   FilePath path;
-  PathService::Get(chrome::DIR_TEST_DATA, &path);
-  path = path.AppendASCII("chromeos").AppendASCII("network_settings").
-      Append(filename);
+  if (!chromeos::test_utils::GetTestDataPath(kNetworkComponentDirectory,
+                                             filename,
+                                             &path)) {
+    NOTREACHED() << "Unable to get test dictionary path for "

[pneubeck (no reviews), 2012/12/10 09:33:10]

better log a message at the DCHECK in GetTestDataPath
and just CHECK here.

+                 << kNetworkComponentDirectory << "/" << filename;
+    return make_scoped_ptr(dict);
+  }
+
   JSONFileValueSerializer serializer(path);
   serializer.set_allow_trailing_comma(true);
 
   std::string error_message;
   base::Value* content = serializer.Deserialize(NULL, &error_message);
   CHECK(content != NULL) << "Couldn't json-deserialize file '"
                          << filename << "': " << error_message;
 
-  base::DictionaryValue* dict = NULL;
   CHECK(content->GetAsDictionary(&dict))
       << "File '" << filename
       << "' does not contain a dictionary as expected, but type "
       << content->GetType();
   return make_scoped_ptr(dict);
 }
 
 ::testing::AssertionResult Equals(const base::DictionaryValue* expected,
                                   const base::DictionaryValue* actual) {
   CHECK(expected != NULL);
   if (actual == NULL)
     return ::testing::AssertionFailure() << "Actual dictionary pointer is NULL";
 
   if (expected->Equals(actual))
     return ::testing::AssertionSuccess() << "Dictionaries are equal";
 
   return ::testing::AssertionFailure() << "Dictionaries are unequal.\n"
                                        << "Expected dictionary:\n" << *expected
                                        << "Actual dictionary:\n" << *actual;
 }
 
 }  // namespace test_utils
 }  // namespace onc
 }  // namespace chromeos