Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2549)

Unified Diff: chrome/browser/sync/glue/theme_data_type_controller_unittest.cc

Issue 2002012: sync: Add location info to unrecoverable error. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add error handler back to bookmark model associator Created 10 years, 6 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/browser/sync/glue/theme_data_type_controller_unittest.cc
===================================================================
--- chrome/browser/sync/glue/theme_data_type_controller_unittest.cc (revision 48898)
+++ chrome/browser/sync/glue/theme_data_type_controller_unittest.cc (working copy)
@@ -22,7 +22,7 @@
using browser_sync::ModelAssociatorMock;
using testing::_;
using testing::DoAll;
-using testing::Invoke;
+using testing::InvokeWithoutArgs;
using testing::Return;
using testing::SetArgumentPointee;
@@ -162,12 +162,13 @@
WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
- EXPECT_CALL(service_, OnUnrecoverableError()).
- WillOnce(Invoke(theme_dtc_.get(), &ThemeDataTypeController::Stop));
+ EXPECT_CALL(service_, OnUnrecoverableError(_,_)).
+ WillOnce(InvokeWithoutArgs(theme_dtc_.get(),
+ &ThemeDataTypeController::Stop));
SetStopExpectations();
EXPECT_CALL(start_callback_, Run(DataTypeController::OK));
theme_dtc_->Start(NewCallback(&start_callback_, &StartCallback::Run));
// This should cause theme_dtc_->Stop() to be called.
- theme_dtc_->OnUnrecoverableError();
+ theme_dtc_->OnUnrecoverableError(FROM_HERE, "Test");
}
Property changes on: chrome\browser\sync\glue\theme_data_type_controller_unittest.cc
___________________________________________________________________
Added: svn:eol-style
+ LF
« no previous file with comments | « chrome/browser/sync/glue/theme_data_type_controller.cc ('k') | chrome/browser/sync/glue/theme_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698