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

11 files changed, 38 insertions, 20 deletions

diff --git a/chrome/service/cloud_print/cloud_print_helpers.h b/chrome/service/cloud_print/cloud_print_helpers.h
index 6f2034f..5fb73c7 100644
--- a/chrome/service/cloud_print/cloud_print_helpers.h
+++ b/chrome/service/cloud_print/cloud_print_helpers.h
@@ -12,10 +12,13 @@
 #include "chrome/service/cloud_print/print_system.h"
 #include "googleurl/src/gurl.h"
 
-class DictionaryValue;
 class Task;
 class URLFetcher;
 
+namespace base {
+class DictionaryValue;
+}
+
 // Helper methods for the cloud print proxy code.
 class CloudPrintHelpers {
  public:
@@ -47,7 +50,8 @@ class CloudPrintHelpers {
   // value returns the value of the "success" value in the response JSON.
   // Returns the response as a dictionary value.
   static bool ParseResponseJSON(const std::string& response_data,
-      bool* succeeded, DictionaryValue** response_dict);
+                                bool* succeeded,
+                                base::DictionaryValue** response_dict);
 
   // Prepares one value as part of a multi-part upload request.
   static void AddMultipartValueForUpload(
@@ -72,4 +76,3 @@ class CloudPrintHelpers {
 };
 
 #endif  // CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_HELPERS_H_
-
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.h b/chrome/service/cloud_print/cloud_print_proxy_backend.h
index 603d4cd..8841ade 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.h
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.h
@@ -13,7 +13,10 @@
 
 class CloudPrintProxyService;
 class GURL;
+
+namespace base {
 class DictionaryValue;
+}
 
 namespace gaia {
 struct OAuthClientInfo;
@@ -56,7 +59,7 @@ class CloudPrintProxyBackend {
   CloudPrintProxyBackend(
       CloudPrintProxyFrontend* frontend,
       const GURL& cloud_print_server_url,
-      const DictionaryValue* print_sys_settings,
+      const base::DictionaryValue* print_sys_settings,
       const gaia::OAuthClientInfo& oauth_client_info,
       bool enable_job_poll);
   ~CloudPrintProxyBackend();
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h
index 0abb3d7..f6f3680 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.h
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h
@@ -11,9 +11,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "content/common/url_fetcher.h"
 
-class DictionaryValue;
 class GURL;
 
+namespace base {
+class DictionaryValue;
+}
+
 namespace net {
 class URLRequestStatus;
 }  // namespace net
@@ -65,7 +68,7 @@ class CloudPrintURLFetcher
     // |succeeded| is the value of the "success" field in the response JSON.
     virtual ResponseAction HandleJSONData(const URLFetcher* source,
                                           const GURL& url,
-                                          DictionaryValue* json_data,
+                                          base::DictionaryValue* json_data,
                                           bool succeeded) {
       return CONTINUE_PROCESSING;
     }
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
index 9fd4318..fccb2ec 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
+#include "base/values.h"
 #include "chrome/service/cloud_print/cloud_print_url_fetcher.h"
 #include "chrome/service/service_process.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/service/cloud_print/job_status_updater.cc b/chrome/service/cloud_print/job_status_updater.cc
index 2f16536..6182ba6 100644
--- a/chrome/service/cloud_print/job_status_updater.cc
+++ b/chrome/service/cloud_print/job_status_updater.cc
@@ -7,6 +7,7 @@
 #include "base/json/json_reader.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "chrome/common/net/http_return.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/cloud_print_helpers.h"
diff --git a/chrome/service/cloud_print/job_status_updater.h b/chrome/service/cloud_print/job_status_updater.h
index cece13a..c5b2de5 100644
--- a/chrome/service/cloud_print/job_status_updater.h
+++ b/chrome/service/cloud_print/job_status_updater.h
@@ -48,7 +48,7 @@ class JobStatusUpdater : public base::RefCountedThreadSafe<JobStatusUpdater>,
   virtual CloudPrintURLFetcher::ResponseAction HandleJSONData(
       const URLFetcher* source,
       const GURL& url,
-      DictionaryValue* json_data,
+      base::DictionaryValue* json_data,
       bool succeeded);
   virtual void OnRequestAuthError();
 
diff --git a/chrome/service/cloud_print/print_system.h b/chrome/service/cloud_print/print_system.h
index cba16c3..b922c52 100644
--- a/chrome/service/cloud_print/print_system.h
+++ b/chrome/service/cloud_print/print_system.h
@@ -15,9 +15,12 @@
 
 #include "printing/backend/print_backend.h"
 
-class DictionaryValue;
 class FilePath;
 
+namespace base {
+class DictionaryValue;
+}
+
 namespace printing {
 class PrintBackend;
 struct PrinterBasicInfo;
@@ -197,7 +200,7 @@ class PrintSystem : public base::RefCountedThreadSafe<PrintSystem> {
   // If print settings are NULL, default settings will be used.
   // Return NULL if no print system available.
   static scoped_refptr<PrintSystem> CreateInstance(
-      const DictionaryValue* print_system_settings);
+      const base::DictionaryValue* print_system_settings);
 };
 
 
diff --git a/chrome/service/cloud_print/print_system_dummy.cc b/chrome/service/cloud_print/print_system_dummy.cc
index ea3fac1..1db2286 100644
--- a/chrome/service/cloud_print/print_system_dummy.cc
+++ b/chrome/service/cloud_print/print_system_dummy.cc
@@ -18,11 +18,10 @@ std::string PrintSystem::GenerateProxyId() {
 }
 
 scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
-    const DictionaryValue* print_system_settings) {
+    const base::DictionaryValue* print_system_settings) {
   NOTREACHED();
   return NULL;
 }
 }  // namespace cloud_print
 
 #endif  // CP_PRINT_SYSTEM_AVAILABLE
-
diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc
index 84ad4929..d1cb33c 100644
--- a/chrome/service/cloud_print/print_system_win.cc
+++ b/chrome/service/cloud_print/print_system_win.cc
@@ -864,7 +864,7 @@ std::string PrintSystem::GenerateProxyId() {
 }
 
 scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
-    const DictionaryValue* print_system_settings) {
+    const base::DictionaryValue* print_system_settings) {
   return new PrintSystemWin;
 }
 
diff --git a/chrome/service/cloud_print/printer_job_handler.h b/chrome/service/cloud_print/printer_job_handler.h
index 12e19df..f01d74d 100644
--- a/chrome/service/cloud_print/printer_job_handler.h
+++ b/chrome/service/cloud_print/printer_job_handler.h
@@ -140,7 +140,7 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>,
   virtual CloudPrintURLFetcher::ResponseAction HandleJSONData(
       const URLFetcher* source,
       const GURL& url,
-      DictionaryValue* json_data,
+      base::DictionaryValue* json_data,
       bool succeeded);
   virtual void OnRequestGiveUp();
   virtual void OnRequestAuthError();
@@ -166,7 +166,7 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>,
   typedef CloudPrintURLFetcher::ResponseAction
       (PrinterJobHandler::*JSONDataHandler)(const URLFetcher* source,
                                             const GURL& url,
-                                            DictionaryValue* json_data,
+                                            base::DictionaryValue* json_data,
                                             bool succeeded);
   // Prototype for a data handler.
   typedef CloudPrintURLFetcher::ResponseAction
@@ -177,19 +177,19 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>,
   CloudPrintURLFetcher::ResponseAction HandlePrinterUpdateResponse(
       const URLFetcher* source,
       const GURL& url,
-      DictionaryValue* json_data,
+      base::DictionaryValue* json_data,
       bool succeeded);
 
   CloudPrintURLFetcher::ResponseAction HandlePrinterDeleteResponse(
       const URLFetcher* source,
       const GURL& url,
-      DictionaryValue* json_data,
+      base::DictionaryValue* json_data,
       bool succeeded);
 
   CloudPrintURLFetcher::ResponseAction HandleJobMetadataResponse(
       const URLFetcher* source,
       const GURL& url,
-      DictionaryValue* json_data,
+      base::DictionaryValue* json_data,
       bool succeeded);
 
   CloudPrintURLFetcher::ResponseAction HandlePrintTicketResponse(
@@ -205,13 +205,13 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>,
   CloudPrintURLFetcher::ResponseAction HandleSuccessStatusUpdateResponse(
       const URLFetcher* source,
       const GURL& url,
-      DictionaryValue* json_data,
+      base::DictionaryValue* json_data,
       bool succeeded);
 
   CloudPrintURLFetcher::ResponseAction HandleFailureStatusUpdateResponse(
       const URLFetcher* source,
       const GURL& url,
-      DictionaryValue* json_data,
+      base::DictionaryValue* json_data,
       bool succeeded);
   // End request handlers for each state in the state machine
 
diff --git a/chrome/service/service_process_prefs.h b/chrome/service/service_process_prefs.h
index 6816f50..e5aecde 100644
--- a/chrome/service/service_process_prefs.h
+++ b/chrome/service/service_process_prefs.h
@@ -10,6 +10,10 @@
 
 #include "chrome/common/json_pref_store.h"
 
+namespace base {
+class DictionaryValue;
+}
+
 // Manages persistent preferences for the service process. This is basically a
 // thin wrapper around JsonPrefStore for more comfortable use.
 class ServiceProcessPrefs {
@@ -39,7 +43,8 @@ class ServiceProcessPrefs {
   void SetBoolean(const std::string& key, bool value);
 
   // Get a dictionary preference for |key| and store it in |result|.
-  void GetDictionary(const std::string& key, const DictionaryValue** result);
+  void GetDictionary(const std::string& key,
+                     const base::DictionaryValue** result);
 
   // Removes the pref specified by |key|.
   void RemovePref(const std::string& key);