Moving google_apis and GaiaClient to src/google_apis.

google_apis/gaia/gaia_auth_consumer.h

 // 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.
 
-#ifndef CHROME_COMMON_NET_GAIA_GAIA_AUTH_CONSUMER_H_
-#define CHROME_COMMON_NET_GAIA_GAIA_AUTH_CONSUMER_H_
+#ifndef GOOGLE_APIS_GAIA_GAIA_AUTH_CONSUMER_H_
+#define GOOGLE_APIS_GAIA_GAIA_AUTH_CONSUMER_H_
 
+#include <map>
 #include <string>
-#include <map>
 #include <vector>
 
 class GoogleServiceAuthError;
 
 namespace net {
 typedef std::vector<std::string> ResponseCookies;
 }
 
 typedef std::map<std::string, std::string> UserInfoMap;
 
@@ skipping 55 matching lines @@
   virtual void OnGetUserInfoSuccess(const UserInfoMap& data) {}
   virtual void OnGetUserInfoFailure(const GoogleServiceAuthError& error) {}
 
   virtual void OnUberAuthTokenSuccess(const std::string& token) {}
   virtual void OnUberAuthTokenFailure(const GoogleServiceAuthError& error) {}
 
   virtual void OnMergeSessionSuccess(const std::string& data) {}
   virtual void OnMergeSessionFailure(const GoogleServiceAuthError& error) {}
 };
 
-#endif  // CHROME_COMMON_NET_GAIA_GAIA_AUTH_CONSUMER_H_
+#endif  // GOOGLE_APIS_GAIA_GAIA_AUTH_CONSUMER_H_