Fix a couple of GaiaAuthFetcherTest tests to work when non-official keys are used.

google_apis/gaia/gaia_auth_fetcher_unittest.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.
 //
 // A complete set of unit tests for GaiaAuthFetcher.
 // Originally ported from GoogleAuthenticator tests.
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/test/base/testing_profile.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/mock_url_fetcher_factory.h"
+#include "google_apis/google_api_keys.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 774 matching lines @@
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientOAuthSuccess(
       GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600))).Times(1);
 
   GaiaAuthFetcher auth(&consumer, "tests", profile_.GetRequestContext());
   std::vector<std::string> scopes;
   scopes.push_back(GaiaUrls::GetInstance()->oauth1_login_scope());
   scopes.push_back("https://some.other.scope.com");
   auth.StartClientOAuth("username", "password", scopes, "", "en");
 
-  scoped_ptr<base::Value> actual(base::JSONReader::Read(auth.request_body_));
-  scoped_ptr<base::Value> expected(base::JSONReader::Read(
+  std::string expected_text = base::StringPrintf(
       "{"
       "\"email\": \"username\","
       "\"password\": \"password\","
       "\"scopes\": [\"https://www.google.com/accounts/OAuthLogin\","
       "             \"https://some.other.scope.com\"],"
-      "\"oauth2_client_id\": \"77185425430.apps.googleusercontent.com\","
+      "\"oauth2_client_id\": \"%s\","
       "\"friendly_device_name\": \"tests\","
       "\"accepts_challenges\": [\"Captcha\", \"TwoStep\"],"
       "\"locale\": \"en\","
       "\"fallback\": { \"name\": \"GetOAuth2Token\" }"
-      "}"));
+      "}",
+      google_apis::GetOAuth2ClientID(google_apis::CLIENT_MAIN).c_str());
+
+  scoped_ptr<base::Value> actual(base::JSONReader::Read(auth.request_body_));
+  scoped_ptr<base::Value> expected(base::JSONReader::Read(expected_text));
   EXPECT_TRUE(expected->Equals(actual.get()));
 }
 
 TEST_F(GaiaAuthFetcherTest, ClientOAuthWithQuote) {
   MockURLFetcherFactory<MockFetcher> factory;
   factory.set_results(kClientOAuthValidResponse);
 
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientOAuthSuccess(
       GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600))).Times(1);
 
   GaiaAuthFetcher auth(&consumer, "te\"sts", profile_.GetRequestContext());
   std::vector<std::string> scopes;
   scopes.push_back("https://some.\"other.scope.com");
   auth.StartClientOAuth("user\"name", "pass\"word", scopes, "", "e\"n");
 
-  scoped_ptr<base::Value> actual(base::JSONReader::Read(auth.request_body_));
-  scoped_ptr<base::Value> expected(base::JSONReader::Read(
+  std::string expected_text = base::StringPrintf(
       "{"
       "\"email\": \"user\\\"name\","
       "\"password\": \"pass\\\"word\","
       "\"scopes\": [\"https://some.\\\"other.scope.com\"],"
-      "\"oauth2_client_id\": \"77185425430.apps.googleusercontent.com\","
+      "\"oauth2_client_id\": \"%s\","
       "\"friendly_device_name\": \"te\\\"sts\","
       "\"accepts_challenges\": [\"Captcha\", \"TwoStep\"],"
       "\"locale\": \"e\\\"n\","
       "\"fallback\": { \"name\": \"GetOAuth2Token\" }"
-      "}"));
+      "}",
+      google_apis::GetOAuth2ClientID(google_apis::CLIENT_MAIN).c_str());

[blundell, 2013/01/10 09:12:22]

Is this generic enough to handle all of the different ways that developers can
specify client ID/secret?

[Jói, 2013/01/10 18:46:25]

Yes, the interfaces in src/google_api/google_api_keys.h are the single way to
retrieve keys, independent of how they're set.

+  scoped_ptr<base::Value> actual(base::JSONReader::Read(auth.request_body_));
+  scoped_ptr<base::Value> expected(base::JSONReader::Read(expected_text));
   EXPECT_TRUE(expected->Equals(actual.get()));
 }
 
 TEST_F(GaiaAuthFetcherTest, ClientOAuthBadAuth) {
   MockURLFetcherFactory<MockFetcher> factory;
   factory.set_success(false);
   factory.set_results("{"
                       "  \"cause\" : \"BadAuthentication\","
                       "  \"fallback\" : {"
                       "    \"name\" : \"Terminating\","
@@ skipping 147 matching lines @@
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
       oauth_login_gurl_, status, net::HTTP_OK, cookies_, data,
       net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }