The LSID for Cloud Print can now be supplied on the command line even if Clou...

chrome/service/service_process.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/service_process.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 40 matching lines @@
 static const int64 kShutdownDelay = 60000;
 
 ServiceProcess::ServiceProcess()
   : shutdown_event_(true, false),
     main_message_loop_(NULL),
     enabled_services_(0) {
   DCHECK(!g_service_process);
   g_service_process = this;
 }
 
-bool ServiceProcess::Initialize(MessageLoop* message_loop) {
+bool ServiceProcess::Initialize(MessageLoop* message_loop,
+                                const CommandLine& command_line) {
   main_message_loop_ = message_loop;
   network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
   io_thread_.reset(new base::Thread("ServiceProcess_IO"));
   file_thread_.reset(new base::Thread("ServiceProcess_File"));
   if (!io_thread_->StartWithOptions(options) ||
       !file_thread_->StartWithOptions(options)) {
     NOTREACHED();
     Teardown();
     return false;
   }
+
+  // See if we have been suppiled an LSID in the command line. This LSID will
+  // override the credentials we use for Cloud Print.
+  std::string lsid = command_line.GetSwitchValueASCII(
+          switches::kServiceAccountLsid);
+
   FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   FilePath pref_path = user_data_dir.Append(chrome::kServiceStateFileName);
   service_prefs_.reset(new JsonPrefStore(pref_path,
                                          file_thread_->message_loop_proxy()));
   service_prefs_->ReadPrefs();
 
   DictionaryValue* values = service_prefs_->prefs();
   bool remoting_host_enabled = false;
 
   // Check if remoting host is already enabled.
   if (values->GetBoolean(prefs::kRemotingHostEnabled, &remoting_host_enabled) &&
       remoting_host_enabled) {
     // If true then we start the host.
     StartChromotingHost();
   }
+  // Enable Cloud Print if needed. First check the command-line.
+  bool cloud_print_proxy_enabled =
+      command_line.HasSwitch(switches::kEnableCloudPrintProxy);
+  if (!cloud_print_proxy_enabled) {
+    // Then check if the cloud print proxy was previously enabled.
+    values->GetBoolean(prefs::kCloudPrintProxyEnabled,
+                       &cloud_print_proxy_enabled);
+  }
 
-  bool cloud_print_proxy_enabled = false;
-
-  // Check if the cloud print proxy is already enabled.
-  if (values->GetBoolean(prefs::kCloudPrintProxyEnabled,
-                         &cloud_print_proxy_enabled) &&
-      cloud_print_proxy_enabled) {
-    GetCloudPrintProxy()->EnableForUser(std::string());
+  if (cloud_print_proxy_enabled) {
+    GetCloudPrintProxy()->EnableForUser(lsid);
   }
 
   LOG(INFO) << "Starting Service Process IPC Server";
   ipc_server_.reset(new ServiceIPCServer(GetServiceProcessChannelName()));
   ipc_server_->Init();
 
   // After the IPC server has started we signal that the service process is
   // running.
   SignalServiceProcessRunning(kServiceProcessCloudPrint);
   return true;
@@ skipping 272 matching lines @@
 #endif
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }
 
 // Disable refcounting for runnable method because it is really not needed
 // when we post tasks on the main message loop.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess);