| Index: trunk/src/components/sync_driver/proxy_data_type_controller.cc
|
| ===================================================================
|
| --- trunk/src/components/sync_driver/proxy_data_type_controller.cc (revision 289354)
|
| +++ trunk/src/components/sync_driver/proxy_data_type_controller.cc (working copy)
|
| @@ -9,7 +9,7 @@
|
| ProxyDataTypeController::ProxyDataTypeController(
|
| scoped_refptr<base::MessageLoopProxy> ui_thread,
|
| syncer::ModelType type)
|
| - : DataTypeController(ui_thread, base::Closure(), DisableTypeCallback()),
|
| + : DataTypeController(ui_thread, base::Closure()),
|
| state_(NOT_RUNNING),
|
| type_(type) {
|
| DCHECK(syncer::ProxyTypes().Has(type_));
|
| @@ -61,8 +61,8 @@
|
| return state_;
|
| }
|
|
|
| -void ProxyDataTypeController::OnSingleDatatypeUnrecoverableError(
|
| - const tracked_objects::Location& from_here, const std::string& message) {
|
| +void ProxyDataTypeController::OnSingleDataTypeUnrecoverableError(
|
| + const syncer::SyncError& error) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
|
|