Adding Test Fixture for initial test cases for the App Remoting Test Driver. Also includes the pub…

remoting/test/access_token_fetcher.cc

 // Copyright 2015 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 "remoting/test/access_token_fetcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/google_api_keys.h"
 #include "net/url_request/url_fetcher.h"
 #include "remoting/base/url_request_context_getter.h"
 
 namespace {
 const int kMaxGetTokensRetries = 3;
 const char kOauthRedirectUrl[] =
     "https://chromoting-oauth.talkgadget."
     "google.com/talkgadget/oauth/chrome-remote-desktop/dev";
-
-// Factory function used to initialize our scope vector below, this is needed
-// because initializer lists are only supported on C++11 compilers.
-const std::vector<std::string> MakeAppRemotingScopeVector() {
-  std::vector<std::string> app_remoting_scopes;
-
-  // Populate the vector with the required permissions for app remoting.
-  app_remoting_scopes.push_back(
-      "https://www.googleapis.com/auth/appremoting.runapplication");
-  app_remoting_scopes.push_back("https://www.googleapis.com/auth/googletalk");
-  app_remoting_scopes.push_back(
-      "https://www.googleapis.com/auth/userinfo.email");
-  app_remoting_scopes.push_back("https://docs.google.com/feeds");
-  app_remoting_scopes.push_back("https://www.googleapis.com/auth/drive");
-
-  return app_remoting_scopes;
-}
-
-const std::vector<std::string> kAppRemotingScopeVector =
-    MakeAppRemotingScopeVector();
 }  // namespace
 
 namespace remoting {
 namespace test {
 
 AccessTokenFetcher::AccessTokenFetcher() {
   oauth_client_info_ = {
       google_apis::GetOAuth2ClientID(google_apis::CLIENT_REMOTING),
       google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_REMOTING),
       kOauthRedirectUrl};
@@ skipping 32 matching lines @@
 
   access_token_.clear();
   refresh_token_ = refresh_token;
   access_token_callback_ = callback;
 
   // Create a new GaiaOAuthClient for each request to GAIA.
   CreateNewGaiaOAuthClientInstance();
   auth_client_->RefreshToken(
       oauth_client_info_,
       refresh_token_,
-      kAppRemotingScopeVector,
+      std::vector<std::string>(),  // scopes
       kMaxGetTokensRetries,
       this);  // GaiaOAuthClient::Delegate* delegate
 }
 
 void AccessTokenFetcher::CreateNewGaiaOAuthClientInstance() {
   scoped_refptr<remoting::URLRequestContextGetter> request_context_getter;
   request_context_getter = new remoting::URLRequestContextGetter(
       base::ThreadTaskRunnerHandle::Get(),   // network_runner
       base::ThreadTaskRunnerHandle::Get());  // file_runner
 
@@ skipping 48 matching lines @@
   std::string error_string;
   std::string error_description;
 
   // Check to see if the token_info we received had any errors,
   // otherwise we will assume that it is valid for our purposes.
   if (token_info->HasKey("error")) {
     token_info->GetString("error", &error_string);
     token_info->GetString("error_description", &error_description);
 
     LOG(ERROR) << "OnGetTokenInfoResponse returned an error. "
-               << ", "
                << "error: " << error_string << ", "
                << "description: " << error_description;
     access_token_.clear();
     refresh_token_.clear();
   } else {
     DVLOG(1) << "Access Token has been validated";
   }
 
   access_token_callback_.Run(access_token_, refresh_token_);
   access_token_callback_.Reset();
@@ skipping 26 matching lines @@
   // Create a new GaiaOAuthClient for each request to GAIA.
   CreateNewGaiaOAuthClientInstance();
   auth_client_->GetTokenInfo(
       access_token_,
       kMaxGetTokensRetries,
       this);  // GaiaOAuthClient::Delegate* delegate
 }
 
 }  // namespace test
 }  // namespace remoting