Move base/values.h into the base namespace. This includes a cros DEPS roll

with a minor change to that code since libcros also uses base/values.h.

BUG=88666
TEST=none
Review URL: http://codereview.chromium.org/7259019

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

1 files changed, 11 insertions, 8 deletions

diff --git a/chrome/browser/ui/webui/web_ui_browsertest.h b/chrome/browser/ui/webui/web_ui_browsertest.h
index 635b0c0..fca2962 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.h
+++ b/chrome/browser/ui/webui/web_ui_browsertest.h
@@ -13,9 +13,12 @@
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/test_navigation_observer.h"
 
-class Value;
 class WebUIMessageHandler;
 
+namespace base {
+class Value;
+}
+
 // This macro simplifies the declaration of simple javascript unit tests.
 // Use:
 //   WEB_UI_UNITTEST_F(MyWebUIPageTest, myJavascriptUnittest);
@@ -34,7 +37,7 @@ class WebUIBrowserTest
     : public InProcessBrowserTest,
       public TestNavigationObserver::JsInjectionReadyObserver {
  public:
-  typedef std::vector<const Value*> ConstValueVector;
+  typedef std::vector<const base::Value*> ConstValueVector;
   virtual ~WebUIBrowserTest();
 
   // Add a custom helper JS library for your test.
@@ -46,10 +49,10 @@ class WebUIBrowserTest
   // Note that calls to functions in test_api.js are not supported.
   bool RunJavascriptFunction(const std::string& function_name);
   bool RunJavascriptFunction(const std::string& function_name,
-                             const Value& arg);
+                             const base::Value& arg);
   bool RunJavascriptFunction(const std::string& function_name,
-                             const Value& arg1,
-                             const Value& arg2);
+                             const base::Value& arg1,
+                             const base::Value& arg2);
   bool RunJavascriptFunction(const std::string& function_name,
                              const ConstValueVector& function_arguments);
 
@@ -60,10 +63,10 @@ class WebUIBrowserTest
   // Runs a test that may include calls to functions in test_api.js.
   bool RunJavascriptTest(const std::string& test_name);
   bool RunJavascriptTest(const std::string& test_name,
-                         const Value& arg);
+                         const base::Value& arg);
   bool RunJavascriptTest(const std::string& test_name,
-                         const Value& arg1,
-                         const Value& arg2);
+                         const base::Value& arg1,
+                         const base::Value& arg2);
   bool RunJavascriptTest(const std::string& test_name,
                          const ConstValueVector& test_arguments);