Removed unnecessary returning by reference.

chrome/service/cloud_print/cloud_print_proxy.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_proxy.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 72 matching lines @@
   client_ = client;
 }
 
 void CloudPrintProxy::EnableForUser(const std::string& lsid) {
   DCHECK(CalledOnValidThread());
   if (!CreateBackend())
     return;
   DCHECK(backend_.get());
   // Read persisted robot credentials because we may decide to reuse it if the
   // passed in LSID belongs the same user.
-  std::string robot_refresh_token;
-  service_prefs_->GetString(prefs::kCloudPrintRobotRefreshToken,
-                            &robot_refresh_token);
-  std::string robot_email;
-  service_prefs_->GetString(prefs::kCloudPrintRobotEmail,
-                            &robot_email);
-  service_prefs_->GetString(prefs::kCloudPrintEmail, &user_email_);
+  std::string robot_refresh_token =
+      service_prefs_->GetString(prefs::kCloudPrintRobotRefreshToken, "");
+  std::string robot_email =
+      service_prefs_->GetString(prefs::kCloudPrintRobotEmail, "");
+  user_email_ = service_prefs_->GetString(prefs::kCloudPrintEmail, user_email_);
 
   // If we have been passed in an LSID, we want to use this to authenticate.
   // Else we will try and retrieve the last used auth tokens from prefs.
   if (!lsid.empty()) {
     backend_->InitializeWithLsid(lsid, robot_refresh_token, robot_email,
                                  user_email_);
   } else {
     // See if we have persisted robot credentials.
     if (!robot_refresh_token.empty()) {
       DCHECK(!robot_email.empty());
       backend_->InitializeWithRobotToken(robot_refresh_token, robot_email);
     } else {
       // Finally see if we have persisted user credentials (legacy case).
-      std::string cloud_print_token;
-      service_prefs_->GetString(prefs::kCloudPrintAuthToken,
-                                &cloud_print_token);
+      std::string cloud_print_token =
+          service_prefs_->GetString(prefs::kCloudPrintAuthToken, "");
       DCHECK(!cloud_print_token.empty());
       backend_->InitializeWithToken(cloud_print_token);
     }
   }
   if (client_) {
     client_->OnCloudPrintProxyEnabled(true);
   }
 }
 
 void CloudPrintProxy::EnableForUserWithRobot(
@@ skipping 20 matching lines @@
 
   // TODO(sanjeevr): Allow overriding OAuthClientInfo in prefs.
   gaia::OAuthClientInfo oauth_client_info;
   oauth_client_info.client_id =
     google_apis::GetOAuth2ClientID(google_apis::CLIENT_CLOUD_PRINT);
   oauth_client_info.client_secret =
     google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_CLOUD_PRINT);
 
   // By default we don't poll for jobs when we lose XMPP connection. But this
   // behavior can be overridden by a preference.
-  bool enable_job_poll = false;
-  service_prefs_->GetBoolean(prefs::kCloudPrintEnableJobPoll,
-    &enable_job_poll);
+  bool enable_job_poll =
+      service_prefs_->GetBoolean(prefs::kCloudPrintEnableJobPoll, false);
 
   backend_.reset(new CloudPrintProxyBackend(this, settings_, oauth_client_info,
                                             enable_job_poll));
   return true;
 }
 
 void CloudPrintProxy::UnregisterPrintersAndDisableForUser() {
   DCHECK(CalledOnValidThread());
   if (backend_.get()) {
     // Try getting auth and printers info from the backend.
@@ skipping 17 matching lines @@
 
 void CloudPrintProxy::GetProxyInfo(cloud_print::CloudPrintProxyInfo* info) {
   info->enabled = enabled_;
   info->email.clear();
   if (enabled_)
     info->email = user_email();
   info->proxy_id = settings_.proxy_id();
   // If the Cloud Print service is not enabled, we may need to read the old
   // value of proxy_id from prefs.
   if (info->proxy_id.empty())
-    service_prefs_->GetString(prefs::kCloudPrintProxyId, &info->proxy_id);
+    info->proxy_id = service_prefs_->GetString(prefs::kCloudPrintProxyId, "");
 }
 
 void CloudPrintProxy::CheckCloudPrintProxyPolicy() {
   g_service_process->io_thread()->message_loop_proxy()->PostTask(
       FROM_HERE, base::Bind(&CheckCloudPrintProxyPolicyInBrowser));
 }
 
 void CloudPrintProxy::OnAuthenticated(
     const std::string& robot_oauth_refresh_token,
     const std::string& robot_email,
@@ skipping 53 matching lines @@
   // Finish disabling cloud print for this user.
   DisableForUser();
 }
 
 void CloudPrintProxy::ShutdownBackend() {
   DCHECK(CalledOnValidThread());
   if (backend_.get())
     backend_->Shutdown();
   backend_.reset();
 }