Moving google_apis and GaiaClient to src/google_apis.

google_apis/google_api_keys.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/common/net/google_apis/google_api_keys.h"
+#include "google_apis/google_api_keys.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringize_macros.h"
 
 #if defined(GOOGLE_CHROME_BUILD)
 // TODO(joi): Include a src-internal file that defines the official
 // keys for official builds, something like: #include
-// "chrome/app/internal/official_google_api_keys.h"
+// "google_apis/internal/official_google_api_keys.h"
 #endif
 
 #if !defined(GOOGLE_API_KEY)
 // TODO(joi): This should be blank here, with the official key
 // provided in official builds.
 #define GOOGLE_API_KEY "abcNOTREALKEYxyz"
 #endif
 
 #if !defined(GOOGLE_CLIENT_ID_MAIN)
 // TODO(joi): This should be blank here, but provided in official
@@ skipping 214 matching lines @@
 
 std::string GetOAuth2ClientID(OAuth2Client client) {
   return g_api_key_cache.Get().GetClientID(client);
 }
 
 std::string GetOAuth2ClientSecret(OAuth2Client client) {
   return g_api_key_cache.Get().GetClientSecret(client);
 }
 
 }  // namespace google_apis