1 files changed, 24 insertions, 20 deletions

diff --git a/content/browser/webui/web_ui.h b/content/browser/webui/web_ui.h
index 8c41e4c..66ee230 100644
--- a/content/browser/webui/web_ui.h
+++ b/content/browser/webui/web_ui.h
@@ -16,14 +16,17 @@
 #include "content/common/page_transition_types.h"
 #include "ipc/ipc_channel.h"
 
-class DictionaryValue;
 class WebUIMessageHandler;
 class GURL;
-class ListValue;
 class Profile;
 class RenderViewHost;
 class TabContents;
+
+namespace base {
+class DictionaryValue;
+class ListValue;
 class Value;
+}
 
 // A WebUI sets up the datasources and message handlers for a given HTML-based
 // UI.
@@ -39,7 +42,7 @@ class WebUI : public IPC::Channel::Listener {
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnWebUISend(const GURL& source_url,
                            const std::string& message,
-                           const ListValue& args);
+                           const base::ListValue& args);
 
   // Called by RenderViewHost when the RenderView is first created. This is
   // *not* called for every page load because in some cases
@@ -63,7 +66,7 @@ class WebUI : public IPC::Channel::Listener {
   virtual void DidBecomeActiveForReusedRenderView() {}
 
   // Used by WebUIMessageHandlers.
-  typedef Callback1<const ListValue*>::Type MessageCallback;
+  typedef Callback1<const base::ListValue*>::Type MessageCallback;
   void RegisterMessageCallback(const std::string& message,
                                MessageCallback* callback);
 
@@ -120,21 +123,21 @@ class WebUI : public IPC::Channel::Listener {
   // There are variants for calls with more arguments.
   void CallJavascriptFunction(const std::string& function_name);
   void CallJavascriptFunction(const std::string& function_name,
-                              const Value& arg);
+                              const base::Value& arg);
   void CallJavascriptFunction(const std::string& function_name,
-                              const Value& arg1,
-                              const Value& arg2);
+                              const base::Value& arg1,
+                              const base::Value& arg2);
   void CallJavascriptFunction(const std::string& function_name,
-                              const Value& arg1,
-                              const Value& arg2,
-                              const Value& arg3);
+                              const base::Value& arg1,
+                              const base::Value& arg2,
+                              const base::Value& arg3);
   void CallJavascriptFunction(const std::string& function_name,
-                              const Value& arg1,
-                              const Value& arg2,
-                              const Value& arg3,
-                              const Value& arg4);
+                              const base::Value& arg1,
+                              const base::Value& arg2,
+                              const base::Value& arg3,
+                              const base::Value& arg4);
   void CallJavascriptFunction(const std::string& function_name,
-                              const std::vector<const Value*>& args);
+                              const std::vector<const base::Value*>& args);
 
   // May be overridden by WebUI's which do not have a tab contents.
   // TODO(estade): removing this Profile dependency is predicated on reworking
@@ -156,8 +159,9 @@ class WebUI : public IPC::Channel::Listener {
 
   // Returns JavaScript code that, when executed, calls the function specified
   // by |function_name| with the arguments specified in |arg_list|.
-  static string16 GetJavascriptCall(const std::string& function_name,
-                                    const std::vector<const Value*>& arg_list);
+  static string16 GetJavascriptCall(
+      const std::string& function_name,
+      const std::vector<const base::Value*>& arg_list);
 
  protected:
   void AddMessageHandler(WebUIMessageHandler* handler);
@@ -209,7 +213,7 @@ class WebUIMessageHandler {
  protected:
   // Adds "url" and "title" keys on incoming dictionary, setting title
   // as the url as a fallback on empty title.
-  static void SetURLAndTitle(DictionaryValue* dictionary,
+  static void SetURLAndTitle(base::DictionaryValue* dictionary,
                              string16 title,
                              const GURL& gurl);
 
@@ -217,10 +221,10 @@ class WebUIMessageHandler {
   virtual void RegisterMessages() = 0;
 
   // Extract an integer value from a list Value.
-  bool ExtractIntegerValue(const ListValue* value, int* out_int);
+  bool ExtractIntegerValue(const base::ListValue* value, int* out_int);
 
   // Extract a string value from a list Value.
-  string16 ExtractStringValue(const ListValue* value);
+  string16 ExtractStringValue(const base::ListValue* value);
 
   WebUI* web_ui_;