Printer list for Google Cloud Print

chrome/browser/local_discovery/cloud_print_base_api_flow.cc

 // Copyright 2013 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 "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/local_discovery/cloud_print_base_api_flow.h"
 #include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
 
 namespace local_discovery {
 
 namespace {
 const char kCloudPrintOAuthHeaderFormat[] = "Authorization: Bearer %s";
 const char kCookieURLFormat[] = "%s%cxsrf=%s&user=%d";
 const char kCookieURLFormatNoXSRF[] = "%s%cuser=%d";
 }
 
 CloudPrintBaseApiFlow::CloudPrintBaseApiFlow(
     net::URLRequestContextGetter* request_context,
     OAuth2TokenService* token_service,
     const GURL& automated_claim_url,
     Delegate* delegate)
     : request_context_(request_context),
       token_service_(token_service),
+      user_index_(kAccountIndexUseOAuth2),
       url_(automated_claim_url),
       delegate_(delegate) {
 }
 
 CloudPrintBaseApiFlow::CloudPrintBaseApiFlow(
     net::URLRequestContextGetter* request_context,
     int  user_index,
     const std::string& xsrf_token,
     const GURL& automated_claim_url,
     Delegate* delegate)
@@ skipping 22 matching lines @@
 
 void CloudPrintBaseApiFlow::Start() {
   if (UseOAuth2()) {
     OAuth2TokenService::ScopeSet oauth_scopes;
     oauth_scopes.insert(cloud_print::kCloudPrintAuth);
     oauth_request_ = token_service_->StartRequest(oauth_scopes, this);
   } else {
     GURL cookie_url;
 
     char separator_character = '?';
-    if (url_.spec().find_first_of('?') == std::string::npos) {
-      separator_character = '&'
+    if (url_.spec().find_first_of('?') != std::string::npos) {
+      separator_character = '&';
     }
 
     if (xsrf_token_.empty()) {
       cookie_url = GURL(base::StringPrintf(kCookieURLFormatNoXSRF,
                                            url_.spec().c_str(),
+                                           separator_character,

[Vitaly Buka (NO REVIEWS), 2013/09/04 21:46:25]

Please use net::AppendQueryParameter(

[Noam Samuel, 2013/09/05 23:08:31]

Done.

                                            user_index_));
     } else {
       cookie_url = GURL(base::StringPrintf(kCookieURLFormat,
                                            url_.spec().c_str(),
+                                           separator_character,
                                            xsrf_token_.c_str(),
                                            user_index_));
     }
 
     CreateRequest(cookie_url);
 
     url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
 
     url_fetcher_->Start();
   }
@@ skipping 56 matching lines @@
 
   if (!value.get() || !value->GetAsDictionary(&dictionary_value)) {
     delegate_->OnCloudPrintAPIFlowError(this, ERROR_MALFORMED_RESPONSE);
     return;
   }
 
   delegate_->OnCloudPrintAPIFlowComplete(this, dictionary_value);
 }
 
 }  // namespace local_discovery