Move values_test_util.{h,cc} to base/test

base/test/values_test_util.h

Index: base/test/values_test_util.h
diff --git a/chrome/test/base/values_test_util.h b/base/test/values_test_util.h
similarity index 53%
rename from chrome/test/base/values_test_util.h
rename to base/test/values_test_util.h
index cb0c340bf04760c2a0e043c4b64bbbca42bcacdb..80cfa0c290d97f8f40b5cb92e7adb2855f331f80 100644
--- a/chrome/test/base/values_test_util.h
+++ b/base/test/values_test_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 CHROME_TEST_BASE_VALUES_TEST_UTIL_H_
-#define CHROME_TEST_BASE_VALUES_TEST_UTIL_H_
+#ifndef BASE_TEST_VALUES_TEST_UTIL_H_
+#define BASE_TEST_VALUES_TEST_UTIL_H_
 #pragma once
 
 #include <string>
@@ -12,37 +12,34 @@ namespace base {
 class DictionaryValue;
 class ListValue;
 class StringValue;
-}
-
-namespace test {
 
 // All the functions below expect that the value for the given key in
 // the given dictionary equals the given expected value.
 
 void ExpectDictBooleanValue(bool expected_value,
-                            const base::DictionaryValue& value,
+                            const DictionaryValue& value,
                             const std::string& key);
 
-void ExpectDictDictionaryValue(const base::DictionaryValue& expected_value,
-                               const base::DictionaryValue& value,
+void ExpectDictDictionaryValue(const DictionaryValue& expected_value,
+                               const DictionaryValue& value,
                                const std::string& key);
 
 void ExpectDictIntegerValue(int expected_value,
-                            const base::DictionaryValue& value,
+                            const DictionaryValue& value,
                             const std::string& key);
 
-void ExpectDictListValue(const base::ListValue& expected_value,
-                         const base::DictionaryValue& value,
+void ExpectDictListValue(const ListValue& expected_value,
+                         const DictionaryValue& value,
                          const std::string& key);
 
 void ExpectDictStringValue(const std::string& expected_value,
-                           const base::DictionaryValue& value,
+                           const DictionaryValue& value,
                            const std::string& key);
 
 // Takes ownership of |actual|.
 void ExpectStringValue(const std::string& expected_str,
-                       base::StringValue* actual);
+                       StringValue* actual);
 
-}  // namespace test
+}  // namespace base
 
-#endif  // CHROME_TEST_BASE_VALUES_TEST_UTIL_H_
+#endif  // BASE_TEST_VALUES_TEST_UTIL_H_