| Index: chrome/browser/sync/glue/data_type_controller.h
|
| diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h
|
| index 448ab806e16f156d57d556ed4ad8394e95ca7360..5eca7483a294de3d03f534c799ec2c180701b3ff 100644
|
| --- a/chrome/browser/sync/glue/data_type_controller.h
|
| +++ b/chrome/browser/sync/glue/data_type_controller.h
|
| @@ -23,8 +23,8 @@ namespace browser_sync {
|
| // Data type controllers need to be refcounted threadsafe, as they may
|
| // need to run model associator or change processor on other threads.
|
| class DataTypeController
|
| - : public base::RefCountedThreadSafe<DataTypeController,
|
| - BrowserThread::DeleteOnUIThread>,
|
| + : public base::RefCountedThreadSafe<
|
| + DataTypeController, content::BrowserThread::DeleteOnUIThread>,
|
| public UnrecoverableErrorHandler {
|
| public:
|
| enum State {
|
| @@ -92,7 +92,8 @@ class DataTypeController
|
| virtual State state() const = 0;
|
|
|
| protected:
|
| - friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
|
| + friend struct content::BrowserThread::DeleteOnThread<
|
| + content::BrowserThread::UI>;
|
| friend class DeleteTask<DataTypeController>;
|
| friend class ShutdownTask;
|
|
|
|
|