Don't delete print system on connector stop.

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"
@@ skipping 16 matching lines @@
   : client_(client),
     proxy_id_(proxy_id),
     cloud_print_server_url_(cloud_print_server_url),
     next_response_handler_(NULL) {
   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.
+  }
+  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;
+}
+
 bool CloudPrintConnector::Start() {
-  DCHECK(!print_system_.get());
   VLOG(1) << "CP_CONNECTOR: Starting connector"
           << ", proxy id: " << proxy_id_;
 
   pending_tasks_.clear();
 
-  print_system_ =
-      cloud_print::PrintSystem::CreateInstance(print_system_settings_.get());
-  if (!print_system_.get()) {
-    NOTREACHED();
-    return false;  // No print system available, fail initalization.
-  }
-  cloud_print::PrintSystem::PrintSystemResult result = print_system_->Init();
-  if (!result.succeeded()) {
-    // We could not initialize the print system. We need to notify the server.
-    ReportUserMessage(kPrintSystemFailedMessageId, result.message());
-    print_system_.release();
+  if (!InitPrintSystem())
     return false;
-  }
 
   // Start watching for updates from the print system.
   print_server_watcher_ = print_system_->CreatePrintServerWatcher();
   print_server_watcher_->StartWatching(this);
 
   // Get list of registered printers.
   AddPendingAvailableTask();
   return true;
 }
 
 void CloudPrintConnector::Stop() {
   VLOG(1) << "CP_CONNECTOR: Stopping connector"
           << ", proxy id: " << proxy_id_;
-  DCHECK(print_system_.get());
-  if (print_system_.get()) {
-    // Do uninitialization here.
-    pending_tasks_.clear();
-    print_server_watcher_.release();
-    print_system_.release();
-  }
+  DCHECK(IsRunning());
+  // Do uninitialization here.
+  pending_tasks_.clear();
+  print_server_watcher_.release();
   request_ = NULL;
 }
 
 bool CloudPrintConnector::IsRunning() {
-  return print_system_.get() != NULL;
+  return print_server_watcher_.get() != NULL;
 }
 
 void CloudPrintConnector::GetPrinterIds(std::list<std::string>* printer_ids) {
   DCHECK(printer_ids);
   printer_ids->clear();
   for (JobHandlerMap::const_iterator iter = job_handler_map_.begin();
        iter != job_handler_map_.end(); ++iter) {
     printer_ids->push_back(iter->first);
   }
 }
@@ skipping 458 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()));
 }