Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: net/websockets/websocket_job_unittest.cc

Issue 6749044: Remove async functionality from net::CookiePolicy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/websockets/websocket_job.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_job_unittest.cc
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index a6f333a5268394363ccec707caed19b9e56e2f87..a0ae1d4ed6b48e3019671b3760412278b64fb846 100644
--- a/net/websockets/websocket_job_unittest.cc
+++ b/net/websockets/websocket_job_unittest.cc
@@ -122,59 +122,32 @@ class MockCookieStore : public CookieStore {
std::vector<Entry> entries_;
};
-class MockCookiePolicy : public CookiePolicy,
- public base::RefCountedThreadSafe<MockCookiePolicy> {
+class MockCookiePolicy : public CookiePolicy {
public:
- MockCookiePolicy() : allow_all_cookies_(true), callback_(NULL) {}
+ MockCookiePolicy() : allow_all_cookies_(true) {}
+ virtual ~MockCookiePolicy() {}
void set_allow_all_cookies(bool allow_all_cookies) {
allow_all_cookies_ = allow_all_cookies;
}
virtual int CanGetCookies(const GURL& url,
- const GURL& first_party_for_cookies,
- CompletionCallback* callback) {
- DCHECK(!callback_);
- callback_ = callback;
- MessageLoop::current()->PostTask(
- FROM_HERE, NewRunnableMethod(this, &MockCookiePolicy::OnCanGetCookies));
- return ERR_IO_PENDING;
+ const GURL& first_party_for_cookies) const {
+ if (allow_all_cookies_)
+ return OK;
+ return ERR_ACCESS_DENIED;
}
virtual int CanSetCookie(const GURL& url,
const GURL& first_party_for_cookies,
- const std::string& cookie_line,
- CompletionCallback* callback) {
- DCHECK(!callback_);
- callback_ = callback;
- MessageLoop::current()->PostTask(
- FROM_HERE, NewRunnableMethod(this, &MockCookiePolicy::OnCanSetCookie));
- return ERR_IO_PENDING;
- }
-
- private:
- friend class base::RefCountedThreadSafe<MockCookiePolicy>;
- virtual ~MockCookiePolicy() {}
-
- void OnCanGetCookies() {
- CompletionCallback* callback = callback_;
- callback_ = NULL;
+ const std::string& cookie_line) const {
if (allow_all_cookies_)
- callback->Run(OK);
- else
- callback->Run(ERR_ACCESS_DENIED);
- }
- void OnCanSetCookie() {
- CompletionCallback* callback = callback_;
- callback_ = NULL;
- if (allow_all_cookies_)
- callback->Run(OK);
- else
- callback->Run(ERR_ACCESS_DENIED);
+ return OK;
+ return ERR_ACCESS_DENIED;
}
+ private:
bool allow_all_cookies_;
- CompletionCallback* callback_;
};
class MockURLRequestContext : public URLRequestContext {
@@ -194,13 +167,13 @@ class WebSocketJobTest : public PlatformTest {
public:
virtual void SetUp() {
cookie_store_ = new MockCookieStore;
- cookie_policy_ = new MockCookiePolicy;
+ cookie_policy_.reset(new MockCookiePolicy);
context_ = new MockURLRequestContext(
cookie_store_.get(), cookie_policy_.get());
}
virtual void TearDown() {
cookie_store_ = NULL;
- cookie_policy_ = NULL;
+ cookie_policy_.reset();
context_ = NULL;
websocket_ = NULL;
socket_ = NULL;
@@ -238,7 +211,7 @@ class WebSocketJobTest : public PlatformTest {
}
scoped_refptr<MockCookieStore> cookie_store_;
- scoped_refptr<MockCookiePolicy> cookie_policy_;
+ scoped_ptr<MockCookiePolicy> cookie_policy_;
scoped_refptr<MockURLRequestContext> context_;
scoped_refptr<WebSocketJob> websocket_;
scoped_refptr<MockSocketStream> socket_;
« no previous file with comments | « net/websockets/websocket_job.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698