chrome/browser/search_engines/template_url_service_sync_unittest.cc - Issue 17127002: Correctly integrate StoragePartition into TestingProfile.

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/search_engines/template_url_service_sync_unittest.cc

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address comments. merge to ToT. Murder a DB thread and more TestBrowserThreads. Created 7 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

« chrome/browser/search_engines/search_provider_install_data_unittest.cc ('K') | « chrome/browser/search_engines/template_url_fetcher_unittest.cc ('k') | chrome/browser/search_engines/template_url_service_test_util.h » ('j') | chrome/browser/search_engines/template_url_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc

diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc

index 0e0c54971fefef35d4d10b70b51903a8a3cb063b..0e89d2b9f9ee9edd7497cf83f2714f01af22274d 100644

--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc

+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc

@@ -4,6 +4,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/scoped_vector.h"

+#include "base/run_loop.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "base/time/time.h"

@@ -1895,7 +1896,7 @@ TEST_F(TemplateURLServiceSyncTest, PreSyncUpdates) {

// Merge the prepopulate search engines.

base::Time pre_merge_time = base::Time::Now();

- test_util_a_.BlockTillServiceProcessesRequests();

+ base::RunLoop().RunUntilIdle();

test_util_a_.ResetModel(true);

// The newly added search engine should have been safely merged, with an