Chromium Code Reviews| Index: components/sync_driver/non_blocking_data_type_controller.h |
| diff --git a/components/sync_driver/non_blocking_data_type_controller.h b/components/sync_driver/non_blocking_data_type_controller.h |
| index d7369ac4a3a39c6b3275f96466e2e863c64ee17c..859301caa08e6e3015cae849d1fc0c7564efb8aa 100644 |
| --- a/components/sync_driver/non_blocking_data_type_controller.h |
| +++ b/components/sync_driver/non_blocking_data_type_controller.h |
| @@ -61,8 +61,8 @@ class NonBlockingDataTypeController : public sync_driver::DataTypeController { |
| ~NonBlockingDataTypeController() override; |
| // Returns SharedModelTypeProcessor associated with the controller. |
| - // The weak pointer should be used only on the model thread. |
| - base::WeakPtr<syncer_v2::SharedModelTypeProcessor> type_processor() const; |
| + // The pointer should be used only on the model thread. |
| + syncer_v2::SharedModelTypeProcessor* type_processor() const; |
|
skym
2016/03/04 22:12:28
I'm not convinced this is a safe change.
Gang Wu
2016/03/08 20:35:25
Done.
|
| // Returns true if the call is made on UI thread. |
| bool BelongsToUIThread() const; |
| @@ -122,9 +122,6 @@ class NonBlockingDataTypeController : public sync_driver::DataTypeController { |
| // callback and must temporarily own it until ActivateDataType is called. |
| scoped_ptr<syncer_v2::ActivationContext> activation_context_; |
| - // A weak pointer to the actual SharedModelTypeProcessor |
| - base::WeakPtr<syncer_v2::SharedModelTypeProcessor> type_processor_; |
| - |
| DISALLOW_COPY_AND_ASSIGN(NonBlockingDataTypeController); |
| }; |