Move common cloud print methods from service/cloud_print to common/cloud_print.

chrome/service/cloud_print/cloud_print_auth.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_auth.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
+#include "chrome/common/cloud_print/cloud_print_constants.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"

[msw, 2012/11/17 00:22:30]

This isn't used any more, please remove.

[Chen Yu, 2012/11/26 12:07:06]

Done.

 #include "chrome/service/cloud_print/cloud_print_token_store.h"
 #include "chrome/service/gaia/service_gaia_authenticator.h"
 #include "chrome/service/net/service_url_request_context.h"
 #include "chrome/service/service_process.h"
 #include "google_apis/gaia/gaia_urls.h"
 
 CloudPrintAuth::CloudPrintAuth(
     Client* client,
     const GURL& cloud_print_server_url,
     const gaia::OAuthClientInfo& oauth_client_info,
     const std::string& proxy_id)
       : client_(client),
         oauth_client_info_(oauth_client_info),
         cloud_print_server_url_(cloud_print_server_url),
         proxy_id_(proxy_id) {
   DCHECK(client);
 }
 
 void CloudPrintAuth::AuthenticateWithLsid(
     const std::string& lsid,
     const std::string& last_robot_refresh_token,
     const std::string& last_robot_email,
     const std::string& last_user_email) {
   // Keeping VLOGs for Cloud Print proxy logging. It is convinient for finding
   // issues with GCP in the field, where only release version is avaialble.
   VLOG(1) << "CP_AUTH: Authenticating with LSID";
   scoped_refptr<ServiceGaiaAuthenticator> gaia_auth_for_print(
       new ServiceGaiaAuthenticator(
-          kProxyAuthUserAgent, kCloudPrintGaiaServiceId,
+          cloud_print::kProxyAuthUserAgent,

[msw, 2012/11/17 00:22:30]

nit: consider putting this file's contents in the cloud_print namespace and
removing the specifiers.

[Chen Yu, 2012/11/26 12:07:06]

Done.

+          cloud_print::kCloudPrintGaiaServiceId,
           GaiaUrls::GetInstance()->client_login_url(),
           g_service_process->io_thread()->message_loop_proxy()));
   gaia_auth_for_print->set_message_loop(MessageLoop::current());
   if (gaia_auth_for_print->AuthenticateWithLsid(lsid)) {
     // Stash away the user email so we can save it in prefs.
     user_email_ = gaia_auth_for_print->email();
     // If the same user is re-enabling Cloud Print and we have stashed robot
     // credentials, we will use those.
     if ((0 == base::strcasecmp(user_email_.c_str(), last_user_email.c_str())) &&
         !last_robot_refresh_token.empty() &&
         !last_robot_email.empty()) {
       AuthenticateWithRobotToken(last_robot_refresh_token,
                                  last_robot_email);
     }
     AuthenticateWithToken(gaia_auth_for_print->auth_token());
   } else {
     // Notify client about authentication error.
     client_->OnInvalidCredentials();
   }
 }
 
 void CloudPrintAuth::AuthenticateWithToken(
     const std::string& cloud_print_token) {
   VLOG(1) << "CP_AUTH: Authenticating with token";
 
   client_login_token_ = cloud_print_token;
 
   // We need to get the credentials of the robot here.
   GURL get_authcode_url =
-      CloudPrintHelpers::GetUrlForGetAuthCode(cloud_print_server_url_,
-                                              oauth_client_info_.client_id,
-                                              proxy_id_);
+     cloud_print::GetUrlForGetAuthCode(cloud_print_server_url_,
+                                       oauth_client_info_.client_id,
+                                       proxy_id_);
   request_ = new CloudPrintURLFetcher;
   request_->StartGetRequest(get_authcode_url,
                             this,
                             kCloudPrintAuthMaxRetryCount,
                             std::string());
 }
 
 void CloudPrintAuth::AuthenticateWithRobotToken(
     const std::string& robot_oauth_refresh_token,
     const std::string& robot_email) {
@@ skipping 72 matching lines @@
     const GURL& url,
     base::DictionaryValue* json_data,
     bool succeeded) {
   if (!succeeded) {
     VLOG(1) << "CP_AUTH: Creating robot account failed";
     client_->OnInvalidCredentials();
     return CloudPrintURLFetcher::STOP_PROCESSING;
   }
 
   std::string auth_code;
-  if (!json_data->GetString(kOAuthCodeValue, &auth_code)) {
+  if (!json_data->GetString(cloud_print::kOAuthCodeValue, &auth_code)) {
     VLOG(1) << "CP_AUTH: Creating robot account returned invalid json response";
     client_->OnInvalidCredentials();
     return CloudPrintURLFetcher::STOP_PROCESSING;
   }
 
-  json_data->GetString(kXMPPJidValue, &robot_email_);
+  json_data->GetString(cloud_print::kXMPPJidValue, &robot_email_);
   // Now that we have an auth code we need to get the refresh and access tokens.
   oauth_client_.reset(new gaia::GaiaOAuthClient(
       gaia::kGaiaOAuth2Url,
       g_service_process->GetServiceURLRequestContextGetter()));
   oauth_client_->GetTokensFromAuthCode(oauth_client_info_,
                                        auth_code,
                                        kCloudPrintAPIMaxRetryCount,
                                        this);
 
   return CloudPrintURLFetcher::STOP_PROCESSING;
 }
 
 CloudPrintURLFetcher::ResponseAction CloudPrintAuth::OnRequestAuthError() {
   VLOG(1) << "CP_AUTH: Creating robot account authentication error";
   // Notify client about authentication error.
   client_->OnInvalidCredentials();
   return CloudPrintURLFetcher::STOP_PROCESSING;
 }
 
 std::string CloudPrintAuth::GetAuthHeader() {
   DCHECK(!client_login_token_.empty());
   std::string header;
   header = "Authorization: GoogleLogin auth=";
   header += client_login_token_;
   return header;
 }
 
 CloudPrintAuth::~CloudPrintAuth() {}