| Index: chrome/common/net/gaia/gaia_authenticator.h
|
| diff --git a/chrome/common/net/gaia/gaia_authenticator.h b/chrome/common/net/gaia/gaia_authenticator.h
|
| index b72b4b2cf7d38e09564e57bedd51540b9d93b1ca..d996a75b699f419d8d679d8e5f11029522c4cf23 100644
|
| --- a/chrome/common/net/gaia/gaia_authenticator.h
|
| +++ b/chrome/common/net/gaia/gaia_authenticator.h
|
| @@ -34,7 +34,6 @@
|
| #include "base/basictypes.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/message_loop.h"
|
| -#include "chrome/common/deprecated/event_sys.h"
|
| #include "googleurl/src/gurl.h"
|
|
|
| namespace gaia {
|
| @@ -58,23 +57,6 @@ enum AuthenticationError {
|
|
|
| class GaiaAuthenticator;
|
|
|
| -struct GaiaAuthEvent {
|
| - enum {
|
| - GAIA_AUTH_FAILED,
|
| - GAIA_AUTH_SUCCEEDED,
|
| - GAIA_AUTHENTICATOR_DESTROYED
|
| - }
|
| - what_happened;
|
| - AuthenticationError error;
|
| - const GaiaAuthenticator* authenticator;
|
| -
|
| - // Lets us use GaiaAuthEvent as its own traits type in hookups.
|
| - typedef GaiaAuthEvent EventType;
|
| - static inline bool IsChannelShutdownEvent(const GaiaAuthEvent& event) {
|
| - return event.what_happened == GAIA_AUTHENTICATOR_DESTROYED;
|
| - }
|
| -};
|
| -
|
| // GaiaAuthenticator can be used to pass user credentials to Gaia and obtain
|
| // cookies set by the Gaia servers.
|
| class GaiaAuthenticator {
|
| @@ -247,12 +229,6 @@ class GaiaAuthenticator {
|
| return auth_results_;
|
| }
|
|
|
| - typedef EventChannel<GaiaAuthEvent, base::Lock> Channel;
|
| -
|
| - inline Channel* channel() const {
|
| - return channel_;
|
| - }
|
| -
|
| private:
|
| bool IssueAuthToken(AuthResults* results, const std::string& service_id);
|
|
|
| @@ -275,8 +251,6 @@ class GaiaAuthenticator {
|
| // simultaneously, the sync code issues auth requests one at a time.
|
| uint32 request_count_;
|
|
|
| - Channel* channel_;
|
| -
|
| // Used to compute backoff time for next allowed authentication.
|
| int delay_; // In seconds.
|
| // On Windows, time_t is 64-bit by default. Even though we have defined the
|
| @@ -297,4 +271,3 @@ class GaiaAuthenticator {
|
|
|
| } // namespace gaia
|
| #endif // CHROME_COMMON_NET_GAIA_GAIA_AUTHENTICATOR_H_
|
| -
|
|
|