Remove deprecated wstring Get(As)String() methods from Value, etc.

BUG=23581
TEST=builds and passes tests

Review URL: http://codereview.chromium.org/3117017

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

5 files changed, 24 insertions, 24 deletions

diff --git a/chrome/service/cloud_print/cloud_print_consts.cc b/chrome/service/cloud_print/cloud_print_consts.cc
index a3dbe6f..2099ba6 100644
--- a/chrome/service/cloud_print/cloud_print_consts.cc
+++ b/chrome/service/cloud_print/cloud_print_consts.cc
@@ -15,15 +15,15 @@ const char kPrinterStatusValue[] = "status";
 const char kPrinterTagValue[] = "tag";
 
 // Values in the respone JSON from the cloud print server
-const wchar_t kPrinterListValue[] = L"printers";
-const wchar_t kSuccessValue[] = L"success";
-const wchar_t kNameValue[] = L"name";
-const wchar_t kIdValue[] = L"id";
-const wchar_t kTicketUrlValue[] = L"ticketUrl";
-const wchar_t kFileUrlValue[] = L"fileUrl";
-const wchar_t kJobListValue[] = L"jobs";
-const wchar_t kTitleValue[] = L"title";
-const wchar_t kPrinterCapsHashValue[] = L"capsHash";
+const char kPrinterListValue[] = "printers";
+const char kSuccessValue[] = "success";
+const char kNameValue[] = "name";
+const char kIdValue[] = "id";
+const char kTicketUrlValue[] = "ticketUrl";
+const char kFileUrlValue[] = "fileUrl";
+const char kJobListValue[] = "jobs";
+const char kTitleValue[] = "title";
+const char kPrinterCapsHashValue[] = "capsHash";
 
 const char kDefaultCloudPrintServerUrl[] = "https://www.google.com/cloudprint";
 const char kCloudPrintTalkServiceUrl[] = "http://www.google.com/cloudprint";
diff --git a/chrome/service/cloud_print/cloud_print_consts.h b/chrome/service/cloud_print/cloud_print_consts.h
index f4dbd04..517687f 100644
--- a/chrome/service/cloud_print/cloud_print_consts.h
+++ b/chrome/service/cloud_print/cloud_print_consts.h
@@ -17,15 +17,15 @@ extern const char kPrinterDefaultsValue[];
 extern const char kPrinterStatusValue[];
 extern const char kPrinterTagValue[];
 // Values in the respone JSON from the cloud print server
-extern const wchar_t kPrinterListValue[];
-extern const wchar_t kSuccessValue[];
-extern const wchar_t kNameValue[];
-extern const wchar_t kIdValue[];
-extern const wchar_t kTicketUrlValue[];
-extern const wchar_t kFileUrlValue[];
-extern const wchar_t kJobListValue[];
-extern const wchar_t kTitleValue[];
-extern const wchar_t kPrinterCapsHashValue[];
+extern const char kPrinterListValue[];
+extern const char kSuccessValue[];
+extern const char kNameValue[];
+extern const char kIdValue[];
+extern const char kTicketUrlValue[];
+extern const char kFileUrlValue[];
+extern const char kJobListValue[];
+extern const char kTitleValue[];
+extern const char kPrinterCapsHashValue[];
 
 extern const char kDefaultCloudPrintServerUrl[];
 extern const char kCloudPrintTalkServiceUrl[];
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
index 257371d..07c40bc 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
@@ -441,7 +441,7 @@ void CloudPrintProxyBackend::Core::RegisterNextPrinter() {
       // Send a hash of the printer capabilities to the server. We will use this
       // later to check if the capabilities have changed
       CloudPrintHelpers::AddMultipartValueForUpload(
-          WideToUTF8(kPrinterCapsHashValue).c_str(),
+          kPrinterCapsHashValue,
           MD5String(last_uploaded_printer_info_.printer_capabilities),
           mime_boundary, std::string(), &post_data);
       // Terminate the request body
@@ -557,9 +557,9 @@ void CloudPrintProxyBackend::Core::InitJobHandlerForPrinter(
     cloud_print::PrinterBasicInfo printer_info;
     printer_data->GetString(kNameValue, &printer_info.printer_name);
     DCHECK(!printer_info.printer_name.empty());
-    printer_data->GetString(UTF8ToWide(kPrinterDescValue),
+    printer_data->GetString(kPrinterDescValue,
                             &printer_info.printer_description);
-    printer_data->GetInteger(UTF8ToWide(kPrinterStatusValue),
+    printer_data->GetInteger(kPrinterStatusValue,
                              &printer_info.printer_status);
     std::string caps_hash;
     printer_data->GetString(kPrinterCapsHashValue, &caps_hash);
diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
index 404e8df..d4d5a9a 100644
--- a/chrome/service/cloud_print/print_system_cups.cc
+++ b/chrome/service/cloud_print/print_system_cups.cc
@@ -83,7 +83,7 @@ namespace cloud_print {
 
 static const char kCUPSPrinterInfoOpt[] = "printer-info";
 static const char kCUPSPrinterStateOpt[] = "printer-state";
-static const wchar_t kCUPSPrintServerURL[] = L"print_server_url";
+static const char kCUPSPrintServerURL[] = "print_server_url";
 
 // Default port for IPP print servers.
 static const int kDefaultIPPServerPort = 631;
diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc
index d5cef62..8abb152 100644
--- a/chrome/service/cloud_print/printer_job_handler.cc
+++ b/chrome/service/cloud_print/printer_job_handler.cc
@@ -154,8 +154,8 @@ bool PrinterJobHandler::UpdatePrinterInfo() {
           mime_boundary, printer_caps.defaults_mime_type,
           &post_data);
       CloudPrintHelpers::AddMultipartValueForUpload(
-          WideToUTF8(kPrinterCapsHashValue).c_str(), caps_hash, mime_boundary,
-          std::string(), &post_data);
+          kPrinterCapsHashValue, caps_hash, mime_boundary, std::string(),
+          &post_data);
     }
   }
   if (printer_info.printer_name != printer_info_.printer_name) {