Convert local printer capabilites to CDD format to unify with cloud printers and PDF printer. This …

chrome/service/cloud_print/print_system_win.cc

 // Copyright (c) 2012 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/print_system.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/object_watcher.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_hdc.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/cloud_print/cloud_print_cdd_conversion.h"
 #include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/service/cloud_print/cdd_conversion_win.h"
 #include "chrome/service/service_process.h"
 #include "chrome/service/service_utility_process_host.h"
 #include "grit/generated_resources.h"
 #include "printing/backend/win_helper.h"
 #include "printing/emf_win.h"
 #include "printing/page_range.h"
 #include "printing/printing_utils.h"
@@ skipping 532 matching lines @@
     Release();
   }
 
   virtual void OnGetPrinterSemanticCapsAndDefaults(
       bool succeeded,
       const std::string& printer_name,
       const printing::PrinterSemanticCapsAndDefaults& semantic_info) OVERRIDE {
     printing::PrinterCapsAndDefaults printer_info;
     if (succeeded) {
       printer_info.caps_mime_type = kContentTypeJSON;
-      printer_info.printer_capabilities = CapabilitiesToCdd(semantic_info);
+      scoped_ptr<base::DictionaryValue> description(
+          PrinterSemanticCapsAndDefaultsToCdd(semantic_info));
+      base::JSONWriter::WriteWithOptions(

[Vitaly Buka (NO REVIEWS), 2014/06/04 00:05:46]

empty string?

[Aleksey Shlyapnikov, 2014/06/04 02:02:47]

Done.

+          description.get(), base::JSONWriter::OPTIONS_PRETTY_PRINT,
+          &printer_info.printer_capabilities);
     }
     callback_.Run(succeeded, printer_name, printer_info);
     callback_.Reset();
     Release();
   }
 
   void StartGetPrinterCapsAndDefaults() {
     g_service_process->io_thread()->message_loop_proxy()->PostTask(
         FROM_HERE,
         base::Bind(&PrinterCapsHandler::GetPrinterCapsAndDefaultsImpl, this,
@@ skipping 255 matching lines @@
 }
 
 }  // namespace
 
 scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
     const base::DictionaryValue* print_system_settings) {
   return new PrintSystemWin;
 }
 
 }  // namespace cloud_print