Removed unnecessary returning by reference.

chrome/service/service_process.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/service_process.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 157 matching lines @@
   service_prefs_->ReadPrefs();
 
   // Check if a locale override has been specified on the command-line.
   std::string locale = command_line.GetSwitchValueASCII(switches::kLang);
   if (!locale.empty()) {
     service_prefs_->SetString(prefs::kApplicationLocale, locale);
     service_prefs_->WritePrefs();
   } else {
     // If no command-line value was specified, read the last used locale from
     // the prefs.
-    service_prefs_->GetString(prefs::kApplicationLocale, &locale);
+    locale = service_prefs_->GetString(prefs::kApplicationLocale, "");
     // If no locale was specified anywhere, use the default one.
     if (locale.empty())
       locale = kDefaultServiceProcessLocale;
   }
   ResourceBundle::InitSharedInstanceWithLocale(locale, NULL);
 
   PrepareRestartOnCrashEnviroment(command_line);
 
   // 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.
-    service_prefs_->GetBoolean(prefs::kCloudPrintProxyEnabled,
-                               &cloud_print_proxy_enabled);
-  }
-
-  if (cloud_print_proxy_enabled) {
+  // Then check if the cloud print proxy was previously enabled.
+  if (command_line.HasSwitch(switches::kEnableCloudPrintProxy) ||
+      service_prefs_->GetBoolean(prefs::kCloudPrintProxyEnabled, false)) {
     GetCloudPrintProxy()->EnableForUser(lsid);
   }
   // Enable Virtual Printer Driver if needed.
-  bool virtual_printer_driver_enabled = false;
-  service_prefs_->GetBoolean(prefs::kVirtualPrinterDriverEnabled,
-                             &virtual_printer_driver_enabled);
-
-  if (virtual_printer_driver_enabled) {
+  if (service_prefs_->GetBoolean(prefs::kVirtualPrinterDriverEnabled, false)) {
     // Register the fact that there is at least one
     // service needing the process.
     OnServiceEnabled();
   }
 
   VLOG(1) << "Starting Service Process IPC Server";
   ipc_server_.reset(new ServiceIPCServer(
       service_process_state_->GetServiceProcessChannel()));
   ipc_server_->Init();
 
@@ skipping 170 matching lines @@
   if (enabled_services_ && !ipc_server_->is_client_connected()) {
     GetCloudPrintProxy()->CheckCloudPrintProxyPolicy();
   }
   ScheduleCloudPrintPolicyCheck();
 }
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }