summaryrefslogtreecommitdiffstats
path: root/chrome/common/net
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 17:50:43 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 17:50:43 +0000
commite476fcea0ba09004afc6b3db472999d36f417ee5 (patch)
tree8c0a8be04d378f5b386fd66755a9dcf429a82db9 /chrome/common/net
parent5078bb0c94c72c8cbcbf05cfd4da99e45f51f61e (diff)
downloadchromium_src-e476fcea0ba09004afc6b3db472999d36f417ee5.zip
chromium_src-e476fcea0ba09004afc6b3db472999d36f417ee5.tar.gz
chromium_src-e476fcea0ba09004afc6b3db472999d36f417ee5.tar.bz2
sync: add DEPS files to subdirs
Remove references to event_sys. Moves some files around. No functional change. BUG=none TEST=none Review URL: http://codereview.chromium.org/7587009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/net')
-rw-r--r--chrome/common/net/gaia/gaia_authenticator.cc12
-rw-r--r--chrome/common/net/gaia/gaia_authenticator.h27
2 files changed, 0 insertions, 39 deletions
diff --git a/chrome/common/net/gaia/gaia_authenticator.cc b/chrome/common/net/gaia/gaia_authenticator.cc
index 54d13e0..a4e34ff 100644
--- a/chrome/common/net/gaia/gaia_authenticator.cc
+++ b/chrome/common/net/gaia/gaia_authenticator.cc
@@ -11,7 +11,6 @@
#include "base/basictypes.h"
#include "base/port.h"
#include "base/string_split.h"
-#include "chrome/common/deprecated/event_sys-inl.h"
#include "chrome/common/net/http_return.h"
#include "googleurl/src/gurl.h"
#include "net/base/escape.h"
@@ -47,13 +46,9 @@ GaiaAuthenticator::GaiaAuthenticator(const string& user_agent,
next_allowed_auth_attempt_time_(0),
early_auth_attempt_count_(0),
message_loop_(NULL) {
- GaiaAuthEvent done = { GaiaAuthEvent::GAIA_AUTHENTICATOR_DESTROYED, None,
- this };
- channel_ = new Channel(done);
}
GaiaAuthenticator::~GaiaAuthenticator() {
- delete channel_;
}
// mutex_ must be entered before calling this function.
@@ -98,13 +93,6 @@ bool GaiaAuthenticator::AuthenticateImpl(const AuthParams& params) {
DCHECK_EQ(MessageLoop::current(), message_loop_);
AuthResults results;
const bool succeeded = AuthenticateImpl(params, &results);
- if (params.request_id == request_count_) {
- auth_results_ = results;
- GaiaAuthEvent event = { succeeded ? GaiaAuthEvent::GAIA_AUTH_SUCCEEDED
- : GaiaAuthEvent::GAIA_AUTH_FAILED,
- results.auth_error, this };
- channel_->NotifyListeners(event);
- }
return succeeded;
}
diff --git a/chrome/common/net/gaia/gaia_authenticator.h b/chrome/common/net/gaia/gaia_authenticator.h
index b72b4b2..d996a75 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_
-