2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/remoting/remoting_setup_flow.cc b/chrome/browser/remoting/remoting_setup_flow.cc
index 27deaff..5bf1a23 100644
--- a/chrome/browser/remoting/remoting_setup_flow.cc
+++ b/chrome/browser/remoting/remoting_setup_flow.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/dom_ui_util.h"
-#include "chrome/browser/google_service_auth_error.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/service/service_process_control_manager.h"
 #include "chrome/common/net/gaia/gaia_authenticator2.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
+#include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/service_process_type.h"
 #include "gfx/font.h"
@@ -103,7 +103,7 @@ void RemotingSetupFlow::OnUserSubmittedAuth(const std::string& user,
 }
 
 void RemotingSetupFlow::OnClientLoginFailure(
-    const GaiaAuthConsumer::GaiaAuthError& error) {
+    const GoogleServiceAuthError& error) {
   message_handler_->ShowGaiaFailed();
   authenticator_.reset();
 }
@@ -150,7 +150,7 @@ void RemotingSetupFlow::OnIssueAuthTokenSuccess(const std::string& service,
 }
 
 void RemotingSetupFlow::OnIssueAuthTokenFailure(const std::string& service,
-                                                const GaiaAuthError& error) {
+    const GoogleServiceAuthError& error) {
   // TODO(hclam): Do something to show the error.
   authenticator_.reset();
 }
diff --git a/chrome/browser/remoting/remoting_setup_flow.h b/chrome/browser/remoting/remoting_setup_flow.h
index 91912e8..1397f10 100644
--- a/chrome/browser/remoting/remoting_setup_flow.h
+++ b/chrome/browser/remoting/remoting_setup_flow.h
@@ -19,6 +19,7 @@
 class GaiaAuthenticator2;
 class RemotingSetupMessageHandler;
 class ServiceProcessControl;
+class GoogleServiceAuthError;
 
 // The state machine used by Remoting for setup wizard.
 class RemotingSetupFlow : public HtmlDialogUIDelegate,
@@ -70,13 +71,13 @@ class RemotingSetupFlow : public HtmlDialogUIDelegate,
 
   // GaiaAuthConsumer implementation.
   virtual void OnClientLoginFailure(
-      const GaiaAuthConsumer::GaiaAuthError& error);
+      const GoogleServiceAuthError& error);
   virtual void OnClientLoginSuccess(
       const GaiaAuthConsumer::ClientLoginResult& credentials);
   virtual void OnIssueAuthTokenSuccess(const std::string& service,
                                        const std::string& auth_token);
   virtual void OnIssueAuthTokenFailure(const std::string& service,
-                                       const GaiaAuthError& error);
+                                       const GoogleServiceAuthError& error);
 
   // Called by RemotingSetupMessageHandler.
   void OnUserSubmittedAuth(const std::string& user,