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

Unified Diff: content/public/test/browser_test_utils.cc

Issue 10875045: Rewrite the cookies pyauto test as browser tests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « content/public/test/browser_test_utils.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_utils.cc
===================================================================
--- content/public/test/browser_test_utils.cc (revision 153070)
+++ content/public/test/browser_test_utils.cc (working copy)
@@ -10,9 +10,11 @@
#include "base/process_util.h"
#include "base/rand_util.h"
#include "base/string_number_conversions.h"
+#include "base/synchronization/waitable_event.h"
#include "base/test/test_timeouts.h"
#include "base/utf_string_conversions.h"
#include "net/base/net_util.h"
+#include "content/public/browser/browser_context.h"
#include "content/public/browser/dom_operation_notification_details.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h"
@@ -21,7 +23,10 @@
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/test/test_utils.h"
+#include "net/cookies/cookie_store.h"
#include "net/test/python_utils.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
#include "testing/gtest/include/gtest/gtest.h"
static const int kDefaultWsPort = 8880;
@@ -146,6 +151,25 @@
event->modifiers |= WebKit::WebInputEvent::MetaKey;
}
+void GetCookiesCallback(std::string* cookies_out,
+ base::WaitableEvent* event,
+ const std::string& cookies) {
+ *cookies_out = cookies;
+ event->Signal();
+}
+
+void GetCookiesOnIOThread(const GURL& url,
+ net::URLRequestContextGetter* context_getter,
+ base::WaitableEvent* event,
+ std::string* cookies) {
+ net::CookieStore* cookie_store =
+ context_getter->GetURLRequestContext()->cookie_store();
+ cookie_store->GetCookiesWithOptionsAsync(
+ url, net::CookieOptions(),
+ base::Bind(&GetCookiesCallback,
+ base::Unretained(cookies), base::Unretained(event)));
+}
+
} // namespace
@@ -281,6 +305,20 @@
return value->GetAsString(result);
}
+std::string GetCookies(BrowserContext* browser_context, const GURL& url) {
+ std::string cookies;
+ base::WaitableEvent event(true, false);
+ net::URLRequestContextGetter* context_getter =
+ browser_context->GetRequestContext();
+
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ base::Bind(&GetCookiesOnIOThread, url,
+ make_scoped_refptr(context_getter), &event, &cookies));
+ event.Wait();
+ return cookies;
+}
+
TitleWatcher::TitleWatcher(WebContents* web_contents,
const string16& expected_title)
: web_contents_(web_contents),
« no previous file with comments | « content/public/test/browser_test_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698