Added CUPS options to the printer information. Options get uploaded to the cl...

chrome/service/cloud_print/cloud_print_proxy_backend.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/service/cloud_print/cloud_print_proxy_backend.h"
 
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 358 matching lines @@
                                                     info.printer_name,
                                                     mime_boundary,
                                                     std::string(), &post_data);
       CloudPrintHelpers::AddMultipartValueForUpload(kPrinterDescValue,
                                                     info.printer_description,
                                                     mime_boundary,
                                                     std::string() , &post_data);
       CloudPrintHelpers::AddMultipartValueForUpload(
           kPrinterStatusValue, StringPrintf("%d", info.printer_status),
           mime_boundary, std::string(), &post_data);
+      // Add printer options as tags.
+      std::map<std::string, std::string>::const_iterator it;
+      for (it = info.options.begin(); it != info.options.end(); ++it) {
+        // TODO(gene) Escape '=' char from name. Warning for now.
+        if (it->first.find('=') != std::string::npos) {
+          LOG(WARNING) << "CUPS option name contains '=' character";
+          NOTREACHED();
+        }
+        std::string msg(it->first);
+        msg += "=";
+        msg += it->second;
+        CloudPrintHelpers::AddMultipartValueForUpload(
+            kPrinterTagValue, msg, mime_boundary, std::string(), &post_data);
+      }
       CloudPrintHelpers::AddMultipartValueForUpload(
           kPrinterCapsValue, last_uploaded_printer_info_.printer_capabilities,
           mime_boundary, last_uploaded_printer_info_.caps_mime_type,
           &post_data);
       CloudPrintHelpers::AddMultipartValueForUpload(
           kPrinterDefaultsValue, last_uploaded_printer_info_.printer_defaults,
           mime_boundary, last_uploaded_printer_info_.defaults_mime_type,
           &post_data);
       // Send a hash of the printer capabilities to the server. We will use this
       // later to check if the capabilities have changed
@@ skipping 199 matching lines @@
     StartRegistration();
   }
 }
 
 // PrinterJobHandler::Delegate implementation
 void CloudPrintProxyBackend::Core::OnPrinterJobHandlerShutdown(
     PrinterJobHandler* job_handler, const std::string& printer_id) {
   job_handler_map_.erase(printer_id);
 }