Print Preview: Making margin selection sticky (part 2/2, again)

chrome/browser/printing/print_system_task_proxy.cc

Index: chrome/browser/printing/print_system_task_proxy.cc
diff --git a/chrome/browser/printing/print_system_task_proxy.cc b/chrome/browser/printing/print_system_task_proxy.cc
index c7787cebc0e0df5bdc4900c38e73ca96666742a0..289f9931c90f3372aa7dc4f2f7504220ad785fe7 100644
--- a/chrome/browser/printing/print_system_task_proxy.cc
+++ b/chrome/browser/printing/print_system_task_proxy.cc
@@ -316,25 +316,22 @@ PrintSystemTaskProxy::~PrintSystemTaskProxy() {
 
 void PrintSystemTaskProxy::GetDefaultPrinter() {
   VLOG(1) << "Get default printer start";
-  StringValue* default_printer = NULL;
+  std::string* default_printer = NULL;
   if (PrintPreviewHandler::last_used_printer_name_ == NULL) {
-    default_printer = new StringValue(
-        print_backend_->GetDefaultPrinterName());
+    default_printer = new std::string(print_backend_->GetDefaultPrinterName());
   } else {
-    default_printer = new StringValue(
+    default_printer = new std::string(
         *PrintPreviewHandler::last_used_printer_name_);
   }
-  std::string default_printer_string;
-  default_printer->GetAsString(&default_printer_string);
   VLOG(1) << "Get default printer finished, found: "
-          << default_printer_string;
+          << default_printer;
 
-  StringValue* cloud_print_data = NULL;
+  std::string* cloud_print_data = NULL;
   if (PrintPreviewHandler::last_used_printer_cloud_print_data_ != NULL) {
-    cloud_print_data = new StringValue(
+    cloud_print_data = new std::string(
         *PrintPreviewHandler::last_used_printer_cloud_print_data_);
   } else {
-    cloud_print_data = new StringValue("");
+    cloud_print_data = new std::string;
   }
 
   BrowserThread::PostTask(
@@ -344,9 +341,9 @@ void PrintSystemTaskProxy::GetDefaultPrinter() {
 }
 
 void PrintSystemTaskProxy::SendDefaultPrinter(
-    const StringValue* default_printer, const StringValue* cloud_print_data) {
+    const std::string* default_printer, const std::string* cloud_print_data) {
   if (handler_)
-    handler_->SendDefaultPrinter(*default_printer, *cloud_print_data);
+    handler_->SendInitialSettings(*default_printer, *cloud_print_data);
   delete default_printer;
 }