Add flag to allow deletion of printers when enumerate fails.

chrome/service/cloud_print/cloud_print_connector.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/cloud_print_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/md5.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/cloud_print/cloud_print_helpers.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/cloud_print_helpers.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+const char kDeleteOnEnumFail[] = "delete_on_enum_fail";
+
 CloudPrintConnector::CloudPrintConnector(
     Client* client,
     const std::string& proxy_id,
     const GURL& cloud_print_server_url,
     const DictionaryValue* print_system_settings)
   : client_(client),
     proxy_id_(proxy_id),
     cloud_print_server_url_(cloud_print_server_url),
-    next_response_handler_(NULL) {
+    next_response_handler_(NULL),
+    delete_on_enum_fail_(false) {
   if (print_system_settings) {
     // It is possible to have no print settings specified.
     print_system_settings_.reset(print_system_settings->DeepCopy());
   }
 }
 
 bool CloudPrintConnector::InitPrintSystem() {
   if (print_system_.get())
     return true;
   print_system_ = cloud_print::PrintSystem::CreateInstance(
       print_system_settings_.get());
   if (!print_system_.get()) {
     NOTREACHED();
     return false;  // No memory.
   }
+  if (print_system_settings_.get()) {
+    bool delete_on_enum_fail = false;
+    print_system_settings_->GetBoolean(kDeleteOnEnumFail,
+                                       &delete_on_enum_fail);
+    delete_on_enum_fail_ = delete_on_enum_fail;
+  }
   cloud_print::PrintSystem::PrintSystemResult result = print_system_->Init();
   if (!result.succeeded()) {
     print_system_.release();
     // We could not initialize the print system. We need to notify the server.
     ReportUserMessage(kPrintSystemFailedMessageId, result.message());
     return false;
   }
   return true;
 }
 
@@ skipping 159 matching lines @@
       DictionaryValue* printer_data = NULL;
       if (printer_list->GetDictionary(index, &printer_data)) {
         std::string printer_name;
         printer_data->GetString(kNameValue, &printer_name);
         if (RemovePrinterFromList(printer_name, &local_printers)) {
           InitJobHandlerForPrinter(printer_data);
         } else {
           // Cloud printer is not found on the local system.
           std::string printer_id;
           printer_data->GetString(kIdValue, &printer_id);
-          if (full_list) {  // Delete only if we get the full list of printer.
+          if (full_list || delete_on_enum_fail_) {
+            // Delete if we get the full list of printers or
+            // |delete_on_enum_fail_| is set.
+            VLOG(1) << "CP_CONNECTOR: Deleting " << printer_name <<
+              " id: " << printer_id <<
+              " full_list: " << full_list <<
+              " delete_on_enum_fail: " << delete_on_enum_fail_;
             AddPendingDeleteTask(printer_id);
           } else {
             LOG(ERROR) << "CP_CONNECTOR: Printer: " << printer_name <<
                 " id: " << printer_id <<
                 " not found in print system and full printer list was" <<
                 " not received.  Printer will not be able to process" <<
                 " jobs.";
           }
         }
       } else {
@@ skipping 331 matching lines @@
                    mime_type,
                    post_data,
                    &CloudPrintConnector::HandleRegisterPrinterResponse);
 }
 
 bool CloudPrintConnector::IsSamePrinter(const std::string& name1,
                                         const std::string& name2) const {
   return (0 == base::strcasecmp(name1.c_str(), name2.c_str()));
 }