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

8 files changed, 16 insertions, 7 deletions

diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
index f53eaa5..b6d0b91 100644
--- a/printing/backend/print_backend.h
+++ b/printing/backend/print_backend.h
@@ -12,7 +12,9 @@
 
 #include "base/memory/ref_counted.h"
 
+namespace base {
 class DictionaryValue;
+}
 
 // This is the interface for platform-specific code for a print backend
 namespace printing {
@@ -69,7 +71,7 @@ class PrintBackend : public base::RefCountedThreadSafe<PrintBackend> {
   // settings will be used.
   // Return NULL if no print backend available.
   static scoped_refptr<PrintBackend> CreateInstance(
-      const DictionaryValue* print_backend_settings);
+      const base::DictionaryValue* print_backend_settings);
 };
 
 }  // namespace printing
diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
index 008f00b..fdc3b7f 100644
--- a/printing/backend/print_backend_dummy.cc
+++ b/printing/backend/print_backend_dummy.cc
@@ -9,6 +9,7 @@
 #include "printing/backend/print_backend.h"
 
 #include "base/logging.h"
+#include "base/values.h"
 
 namespace printing {
 
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index 3fb0573..dbbb270 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -186,7 +186,7 @@ bool PrintBackendWin::IsValidPrinter(const std::string& printer_name) {
 }
 
 scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
-    const DictionaryValue* print_backend_settings) {
+    const base::DictionaryValue* print_backend_settings) {
   return new PrintBackendWin;
 }
 
diff --git a/printing/print_dialog_gtk_interface.h b/printing/print_dialog_gtk_interface.h
index c47f978..4fb9341 100644
--- a/printing/print_dialog_gtk_interface.h
+++ b/printing/print_dialog_gtk_interface.h
@@ -24,7 +24,7 @@ class PrintDialogGtkInterface {
   // dictionary of settings with possible keys from
   // printing/print_job_constants.h. Only used when printing without the system
   // print dialog. E.g. for Print Preview. Returns false on error.
-  virtual bool UpdateSettings(const DictionaryValue& settings,
+  virtual bool UpdateSettings(const base::DictionaryValue& settings,
                               const PageRanges& ranges) = 0;
 
   // Shows the dialog and handles the response with |callback|. Only used when
diff --git a/printing/printing_context.h b/printing/printing_context.h
index 8247aca..dd7e058 100644
--- a/printing/printing_context.h
+++ b/printing/printing_context.h
@@ -13,7 +13,9 @@
 #include "printing/print_settings.h"
 #include "ui/gfx/native_widget_types.h"
 
+namespace base {
 class DictionaryValue;
+}
 
 namespace printing {
 
@@ -51,7 +53,7 @@ class PrintingContext {
 
   // Updates print settings. |job_settings| contains all print job settings
   // information. |ranges| has the new page range settings.
-  virtual Result UpdatePrintSettings(const DictionaryValue& job_settings,
+  virtual Result UpdatePrintSettings(const base::DictionaryValue& job_settings,
                                      const PageRanges& ranges) = 0;
 
   // Initializes with predefined settings.
diff --git a/printing/printing_context_cairo.h b/printing/printing_context_cairo.h
index 5bc30e6..49d72b5 100644
--- a/printing/printing_context_cairo.h
+++ b/printing/printing_context_cairo.h
@@ -9,6 +9,10 @@
 
 #include "printing/printing_context.h"
 
+namespace base {
+class DictionaryValue;
+}
+
 namespace printing {
 
 class Metafile;
@@ -35,7 +39,7 @@ class PrintingContextCairo : public PrintingContext {
                                   bool has_selection,
                                   PrintSettingsCallback* callback);
   virtual Result UseDefaultSettings();
-  virtual Result UpdatePrintSettings(const DictionaryValue& job_settings,
+  virtual Result UpdatePrintSettings(const base::DictionaryValue& job_settings,
                                      const PageRanges& ranges);
   virtual Result InitWithSettings(const PrintSettings& settings);
   virtual Result NewDocument(const string16& document_name);
diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
index af6f9f6..cb3e0e2 100644
--- a/printing/printing_context_mac.h
+++ b/printing/printing_context_mac.h
@@ -30,7 +30,7 @@ class PrintingContextMac : public PrintingContext {
                                   bool has_selection,
                                   PrintSettingsCallback* callback);
   virtual Result UseDefaultSettings();
-  virtual Result UpdatePrintSettings(const DictionaryValue& job_settings,
+  virtual Result UpdatePrintSettings(const base::DictionaryValue& job_settings,
                                      const PageRanges& ranges);
   virtual Result InitWithSettings(const PrintSettings& settings);
   virtual Result NewDocument(const string16& document_name);
diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
index 98ee8e9..81a61c3 100644
--- a/printing/printing_context_win.h
+++ b/printing/printing_context_win.h
@@ -28,7 +28,7 @@ class PrintingContextWin : public PrintingContext {
                                   bool has_selection,
                                   PrintSettingsCallback* callback);
   virtual Result UseDefaultSettings();
-  virtual Result UpdatePrintSettings(const DictionaryValue& job_settings,
+  virtual Result UpdatePrintSettings(const base::DictionaryValue& job_settings,
                                      const PageRanges& ranges);
   virtual Result InitWithSettings(const PrintSettings& settings);
   virtual Result NewDocument(const string16& document_name);