Make CUPS cloud print proxy to support multiple print servers....

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 <map>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 308 matching lines @@
   DCHECK(MessageLoop::current() == backend_->core_thread_.message_loop());
   VLOG(1) << "CP_PROXY: Starting proxy, id: " << proxy_id;
 
   print_system_ =
       cloud_print::PrintSystem::CreateInstance(print_system_settings_.get());
   if (!print_system_.get()) {
     NOTREACHED();
     return;  // No print system available, fail initalization.
   }
 
+  print_system_->Init();
+
   // TODO(sanjeevr): Validate the tokens.
   auth_token_ = cloud_print_token;
 
   const notifier::NotifierOptions kNotifierOptions;
   const bool kInvalidateXmppAuthToken = false;
   const bool kAllowInsecureXmppConnection = false;
   talk_mediator_.reset(new notifier::TalkMediatorImpl(
       new notifier::PushNotificationsThread(kNotifierOptions,
                                             kCloudPrintPushNotificationsSource),
       kInvalidateXmppAuthToken,
@@ skipping 38 matching lines @@
                                     kMaxRetries,
                                     kInitialTimeout,
                                     kMultiplier,
                                     kConstantFactor,
                                     kMaximumTimeout);
 }
 
 void CloudPrintProxyBackend::Core::StartRegistration() {
   DCHECK(MessageLoop::current() == backend_->core_thread_.message_loop());
   printer_list_.clear();
-  print_system_->GetPrintBackend()->EnumeratePrinters(&printer_list_);
+  print_system_->EnumeratePrinters(&printer_list_);
   // Now we need to ask the server about printers that were registered on the
   // server so that we can trim this list.
   GetRegisteredPrinters();
 }
 
 void CloudPrintProxyBackend::Core::EndRegistration() {
   DCHECK(MessageLoop::current() == backend_->core_thread_.message_loop());
   request_ = NULL;
   if (new_printers_available_) {
     new_printers_available_ = false;
@@ skipping 48 matching lines @@
   // For the next printer to be uploaded, create a multi-part post request to
   // upload the printer capabilities and the printer defaults.
   if (next_upload_index_ < printer_list_.size()) {
     const printing::PrinterBasicInfo& info =
         printer_list_.at(next_upload_index_);
     bool have_printer_info = true;
     // If we are retrying a previous upload, we don't need to fetch the caps
     // and defaults again.
     if (info.printer_name != last_uploaded_printer_name_) {
       have_printer_info =
-          print_system_->GetPrintBackend()->GetPrinterCapsAndDefaults(
+          print_system_->GetPrinterCapsAndDefaults(
               info.printer_name.c_str(), &last_uploaded_printer_info_);
     }
     if (have_printer_info) {
       last_uploaded_printer_name_ = info.printer_name;
       std::string mime_boundary;
       CloudPrintHelpers::CreateMimeBoundaryForUpload(&mime_boundary);
       std::string post_data;
       CloudPrintHelpers::AddMultipartValueForUpload(kProxyIdValue, proxy_id_,
                                                     mime_boundary,
                                                     std::string(), &post_data);
@@ skipping 293 matching lines @@
   VLOG(1) << "CP_PROXY: Printer job handle shutdown, id " << printer_id;
   job_handler_map_.erase(printer_id);
 }
 
 void CloudPrintProxyBackend::Core::OnAuthError() {
   DCHECK(MessageLoop::current() == backend_->core_thread_.message_loop());
   VLOG(1) << "CP_PROXY: Auth Error";
   backend_->frontend_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
       &Core::NotifyAuthenticationFailed));
 }