printing: Convert some wstrings to string16s.

BUG=none
TEST=none

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

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

3 files changed, 13 insertions, 14 deletions

diff --git a/printing/print_settings.h b/printing/print_settings.h
index 23de5b7..4e40231 100644
--- a/printing/print_settings.h
+++ b/printing/print_settings.h
@@ -35,14 +35,14 @@ class PRINTING_EXPORT PrintSettings {
   bool Equals(const PrintSettings& rhs) const;
 
   void set_landscape(bool landscape) { landscape_ = landscape; }
-  void set_printer_name(const std::wstring& printer_name) {
+  void set_printer_name(const string16& printer_name) {
     printer_name_ = printer_name;
   }
-  const std::wstring& printer_name() const { return printer_name_; }
-  void set_device_name(const std::wstring& device_name) {
+  const string16& printer_name() const { return printer_name_; }
+  void set_device_name(const string16& device_name) {
     device_name_ = device_name;
   }
-  const std::wstring& device_name() const { return device_name_; }
+  const string16& device_name() const { return device_name_; }
   void set_dpi(int dpi) { dpi_ = dpi; }
   int dpi() const { return dpi_; }
   void set_supports_alpha_blend(bool supports_alpha_blend) {
@@ -110,10 +110,10 @@ class PRINTING_EXPORT PrintSettings {
   // Settings that can't be changed without side-effects.
 
   // Printer name as shown to the user.
-  std::wstring printer_name_;
+  string16 printer_name_;
 
   // Printer device name as opened by the OS.
-  std::wstring device_name_;
+  string16 device_name_;
 
   // Page setup in device units.
   PageSetup page_setup_device_units_;
diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc
index 9b8915c..a0df0c8 100644
--- a/printing/print_settings_initializer_gtk.cc
+++ b/printing/print_settings_initializer_gtk.cc
@@ -7,7 +7,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkprinter.h>
 
-#include "base/string_piece.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "printing/print_settings.h"
 #include "printing/units.h"
@@ -25,10 +25,9 @@ void PrintSettingsInitializerGtk::InitPrintSettings(
   DCHECK(page_setup);
   DCHECK(print_settings);
 
-  // TODO(jhawkins): |printer_name_| and |device_name_| should be string16.
-  base::StringPiece name(
-      reinterpret_cast<const char*>(gtk_print_settings_get_printer(settings)));
-  print_settings->set_printer_name(UTF8ToWide(name));
+  string16 name(UTF8ToUTF16(static_cast<const char*>(
+      gtk_print_settings_get_printer(settings))));
+  print_settings->set_printer_name(name);
   print_settings->set_device_name(print_settings->printer_name());
   print_settings->ranges = new_ranges;
   print_settings->selection_only = print_selection_only;
diff --git a/printing/print_settings_initializer_mac.cc b/printing/print_settings_initializer_mac.cc
index 5bb7282..12fe1bd 100644
--- a/printing/print_settings_initializer_mac.cc
+++ b/printing/print_settings_initializer_mac.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -19,9 +19,9 @@ void PrintSettingsInitializerMac::InitPrintSettings(
   DCHECK(print_settings);
 
   print_settings->set_printer_name(
-      base::SysCFStringRefToWide(PMPrinterGetName(printer)));
+      base::SysCFStringRefToUTF16(PMPrinterGetName(printer)));
   print_settings->set_device_name(
-      base::SysCFStringRefToWide(PMPrinterGetID(printer)));
+      base::SysCFStringRefToUTF16(PMPrinterGetID(printer)));
   print_settings->ranges = new_ranges;
 
   PMOrientation orientation = kPMPortrait;