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

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

Issue 8366030: Introduce the plumbing necessary to report Unrecoverable error from model safe workers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For review. 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
Index: chrome/browser/sync/glue/ui_model_worker_unittest.cc
diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
index c0230f1879016f99aa85118b1dde05705c3f0701..ebc5e3d77767a246f4ce20401bca16273b90a057 100644
--- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
@@ -9,10 +9,12 @@
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "chrome/browser/sync/glue/ui_model_worker.h"
+#include "chrome/browser/sync/sessions/unrecoverable_error_info.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
using browser_sync::UIModelWorker;
+using browser_sync::sessions::UnrecoverableErrorInfo;
// Various boilerplate, primarily for the StopWithPendingWork test.
@@ -24,7 +26,7 @@ class UIModelWorkerVisitor {
was_run_(was_run) { }
virtual ~UIModelWorkerVisitor() { }
- virtual void DoWork() {
+ virtual void DoWork(UnrecoverableErrorInfo* error_info) {
EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
was_run_->Signal();
if (quit_loop_when_run_)
@@ -44,7 +46,8 @@ class Syncer {
~Syncer() {}
void SyncShare(UIModelWorkerVisitor* visitor) {
- scoped_ptr<Callback0::Type> c(NewCallback(visitor,
+ scoped_ptr<Callback1<UnrecoverableErrorInfo*>::Type> c(
+ NewCallback(visitor,
&UIModelWorkerVisitor::DoWork));
worker_->DoWorkAndWaitUntilDone(c.get());
}

Powered by Google App Engine
This is Rietveld 408576698