chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc - Issue 8345026: Prevent crash on unrecoverable error method call on FrontendDataTypeControllers.

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/frontend_data_type_controller_unittest.cc

Issue 8345026: Prevent crash on unrecoverable error method call on FrontendDataTypeControllers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Upload before commit. Created 9 years, 2 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/frontend_data_type_controller.cc ('k') | chrome/browser/sync/glue/preference_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0ae5e59d48a39094dc81f82483b7a6baed98c4f5..2586b87ee8f0330bf3a664ce2f5a0009104921d6 100644

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

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

@@ -129,6 +129,10 @@ class FrontendDataTypeControllerTest : public testing::Test {

EXPECT_CALL(start_callback_, Run(result,_));

}

+ void PumpLoop() {

+ message_loop_.RunAllPending();

+ }

MessageLoopForUI message_loop_;

BrowserThread ui_thread_;

scoped_refptr<FrontendDataTypeControllerFake> frontend_dtc_;

@@ -242,6 +246,7 @@ TEST_F(FrontendDataTypeControllerTest, OnUnrecoverableError) {

frontend_dtc_->Start(NewCallback(&start_callback_, &StartCallback::Run));

EXPECT_EQ(DataTypeController::RUNNING, frontend_dtc_->state());

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

- frontend_dtc_->OnUnrecoverableError(FROM_HERE, "Test");

+ frontend_dtc_->OnUnrecoverableError(FROM_HERE, "Test");

+ PumpLoop();

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

}