chrome/browser/extensions/activity_log/activity_log_browsertest.cc - Issue 233353003: Only commit cookie changes in prerenders after a prerender is shown

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/activity_log/activity_log_browsertest.cc

Issue 233353003: Only commit cookie changes in prerenders after a prerender is shown (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: sync @269781 + 'autlock'->'autolock' from erik's comment that was not included before Created 6 years, 7 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:

Index: chrome/browser/extensions/activity_log/activity_log_browsertest.cc

===================================================================

--- chrome/browser/extensions/activity_log/activity_log_browsertest.cc (revision 269781)

+++ chrome/browser/extensions/activity_log/activity_log_browsertest.cc (working copy)

@@ -12,7 +12,10 @@

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/ui_test_utils.h"

+#include "content/public/browser/browser_context.h"

+#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

+#include "content/public/browser/storage_partition.h"

#include "content/public/test/browser_test_utils.h"

#include "net/dns/mock_host_resolver.h"

#include "net/test/embedded_test_server/embedded_test_server.h"

@@ -99,6 +102,13 @@

"http://www.google.com.bo:%d/test.html",

port));

+ if (!prerender_manager->cookie_store_loaded()) {

+ base::RunLoop loop;

+ prerender_manager->set_on_cookie_store_loaded_cb_for_testing(

+ loop.QuitClosure());

+ loop.Run();

+ }

const gfx::Size kSize(640, 480);

scoped_ptr<prerender::PrerenderHandle> prerender_handle(

prerender_manager->AddPrerenderFromLocalPredictor(