chrome/test/base/testing_profile.cc - Issue 10807047: Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows…

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/test/base/testing_profile.cc

Issue 10807047: Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 years, 5 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

Index: chrome/test/base/testing_profile.cc

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

--- chrome/test/base/testing_profile.cc (revision 147577)

+++ chrome/test/base/testing_profile.cc (working copy)

@@ -53,8 +53,8 @@

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

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

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

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

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

+#include "content/public/test/test_utils.h"

#include "net/cookies/cookie_monster.h"

#include "net/url_request/url_request_context.h"

#include "net/url_request/url_request_context_getter.h"

@@ -406,7 +406,7 @@

// TODO(phajdan.jr): Doesn't this hang if Top Sites are already loaded?

void TestingProfile::BlockUntilTopSitesLoaded() {

- ui_test_utils::WindowedNotificationObserver top_sites_loaded_observer(

+ content::WindowedNotificationObserver top_sites_loaded_observer(

chrome::NOTIFICATION_TOP_SITES_LOADED,

content::NotificationService::AllSources());

if (!GetHistoryService(Profile::EXPLICIT_ACCESS))

« no previous file with comments | « chrome/test/base/test_web_dialog_observer.cc ('k') | chrome/test/base/tracing.cc » ('j') | no next file with comments »