chrome/browser/sync/glue/search_engine_data_type_controller_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/sync/glue/search_engine_data_type_controller_unittest.cc

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

Patch Set: fix InstantNTP test. 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

« no previous file with comments | « chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc ('k') | chrome/browser/sync/glue/sync_backend_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

index ec8ba1ffe4885b23c9d730470776dd406f9cfa13..3f95b143420f15121da9397482e3347fe81a0981 100644

--- a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

+++ b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

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

#include "base/bind_helpers.h"

#include "base/callback.h"

#include "base/memory/scoped_ptr.h"

+#include "base/run_loop.h"

#include "base/tracked_objects.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

@@ -143,7 +144,7 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceNotReady) {

EXPECT_EQ(DataTypeController::MODEL_LOADED, search_engine_dtc_->state());

// Wait until WebDB is loaded before we shut it down.

- test_util_.BlockTillServiceProcessesRequests();

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

}

TEST_F(SyncSearchEngineDataTypeControllerTest, StartFirstRun) {

@@ -222,7 +223,7 @@ TEST_F(SyncSearchEngineDataTypeControllerTest,

Start();

// This should cause search_engine_dtc_->Stop() to be called.

search_engine_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");

- test_util_.PumpLoop();

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

EXPECT_EQ(DataTypeController::NOT_RUNNING, search_engine_dtc_->state());

EXPECT_FALSE(syncable_service_.syncing());

}