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

Unified Diff: chrome/browser/gtk/options/cookies_view_unittest.cc

Issue 258008: Move initialization of ChromeURLRequestContexts to the IO thread. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync again, just in case Created 11 years, 2 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 | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/browser/importer/toolbar_importer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/options/cookies_view_unittest.cc
===================================================================
--- chrome/browser/gtk/options/cookies_view_unittest.cc (revision 29872)
+++ chrome/browser/gtk/options/cookies_view_unittest.cc (working copy)
@@ -11,6 +11,7 @@
#include "base/string_util.h"
#include "chrome/browser/cookies_table_model.h"
+#include "chrome/browser/net/url_request_context_getter.h"
#include "chrome/test/testing_profile.h"
#include "net/url_request/url_request_context.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -24,17 +25,35 @@
}
};
+class TestURLRequestContextGetter : public URLRequestContextGetter {
+ public:
+ virtual URLRequestContext* GetURLRequestContext() {
+ if (!context_)
+ context_ = new TestURLRequestContext();
+ return context_;
+ }
+ virtual net::CookieStore* GetCookieStore() {
+ return GetURLRequestContext()->cookie_store();
+ }
+ private:
+ scoped_refptr<URLRequestContext> context_;
+};
+
class CookieTestingProfile : public TestingProfile {
public:
- virtual URLRequestContext* GetRequestContext() {
- if (!url_request_context_.get())
- url_request_context_ = new TestURLRequestContext;
- return url_request_context_.get();
+ virtual URLRequestContextGetter* GetRequestContext() {
+ if (!url_request_context_getter_.get())
+ url_request_context_getter_ = new TestURLRequestContextGetter;
+ return url_request_context_getter_.get();
}
virtual ~CookieTestingProfile() {}
+ net::CookieMonster* GetCookieMonster() {
+ return GetRequestContext()->GetCookieStore()->GetCookieMonster();
+ }
+
private:
- scoped_refptr<TestURLRequestContext> url_request_context_;
+ scoped_refptr<URLRequestContextGetter> url_request_context_getter_;
};
} // namespace
@@ -112,8 +131,7 @@
}
TEST_F(CookiesViewTest, RemoveAll) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo"), "A=1");
monster->SetCookie(GURL("http://foo2"), "B=1");
CookiesView cookies_view(profile_.get());
@@ -175,8 +193,7 @@
}
TEST_F(CookiesViewTest, Remove) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "A=1");
monster->SetCookie(GURL("http://foo2"), "B=1");
monster->SetCookie(GURL("http://foo3"), "C=1");
@@ -242,8 +259,7 @@
}
TEST_F(CookiesViewTest, RemoveMultiple) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo0"), "C=1");
monster->SetCookie(GURL("http://foo1"), "D=1");
monster->SetCookie(GURL("http://foo2"), "B=1");
@@ -279,8 +295,7 @@
}
TEST_F(CookiesViewTest, RemoveDefaultSelection) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "A=1");
monster->SetCookie(GURL("http://foo2"), "B=1");
monster->SetCookie(GURL("http://foo3"), "C=1");
@@ -309,8 +324,7 @@
}
TEST_F(CookiesViewTest, Filter) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "A=1");
monster->SetCookie(GURL("http://bar1"), "B=1");
monster->SetCookie(GURL("http://foo2"), "C=1");
@@ -344,8 +358,7 @@
}
TEST_F(CookiesViewTest, FilterRemoveAll) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "A=1");
monster->SetCookie(GURL("http://bar1"), "B=1");
monster->SetCookie(GURL("http://foo2"), "C=1");
@@ -370,8 +383,7 @@
}
TEST_F(CookiesViewTest, FilterRemove) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "A=1");
monster->SetCookie(GURL("http://bar1"), "B=1");
monster->SetCookie(GURL("http://foo2"), "C=1");
@@ -406,8 +418,7 @@
}
TEST_F(CookiesViewTest, Sort) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "X=1");
monster->SetCookie(GURL("http://bar1"), "Z=1");
monster->SetCookie(GURL("http://foo2"), "C=1");
@@ -442,8 +453,7 @@
}
TEST_F(CookiesViewTest, SortRemove) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "B=1");
monster->SetCookie(GURL("http://bar1"), "Z=1");
monster->SetCookie(GURL("http://foo2"), "C=1");
@@ -471,8 +481,7 @@
}
TEST_F(CookiesViewTest, SortFilterRemove) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "B=1");
monster->SetCookie(GURL("http://bar1"), "Z=1");
monster->SetCookie(GURL("http://foo2"), "C=1");
@@ -506,8 +515,7 @@
}
TEST_F(CookiesViewTest, SortRemoveMultiple) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo0"), "C=1");
monster->SetCookie(GURL("http://foo1"), "D=1");
monster->SetCookie(GURL("http://foo2"), "B=1");
@@ -546,8 +554,7 @@
}
TEST_F(CookiesViewTest, SortRemoveDefaultSelection) {
- net::CookieMonster* monster =
- profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+ net::CookieMonster* monster = profile_->GetCookieMonster();
monster->SetCookie(GURL("http://foo1"), "Z=1");
monster->SetCookie(GURL("http://bar1"), "X=1");
monster->SetCookie(GURL("http://foo2"), "W=1");
« no previous file with comments | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/browser/importer/toolbar_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698