| Index: content/public/test/mock_render_thread.h
|
| diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
|
| index 5783c096397dd407b21d04709772606e8b576a57..9ce49ecd338435108ccc1463bfbcc89b34cd8281 100644
|
| --- a/content/public/test/mock_render_thread.h
|
| +++ b/content/public/test/mock_render_thread.h
|
| @@ -110,9 +110,7 @@ class MockRenderThread : public RenderThread {
|
| // Dispatches control messages to observers.
|
| bool OnControlMessageReceived(const IPC::Message& msg);
|
|
|
| - ObserverList<RenderProcessObserver>& observers() {
|
| - return observers_;
|
| - }
|
| + base::ObserverList<RenderProcessObserver>& observers() { return observers_; }
|
|
|
| protected:
|
| // This function operates as a regular IPC listener. Subclasses
|
| @@ -170,7 +168,7 @@ class MockRenderThread : public RenderThread {
|
| std::vector<scoped_refptr<IPC::MessageFilter> > filters_;
|
|
|
| // Observers to notify.
|
| - ObserverList<RenderProcessObserver> observers_;
|
| + base::ObserverList<RenderProcessObserver> observers_;
|
|
|
| cc::TestSharedBitmapManager shared_bitmap_manager_;
|
| };
|
|
|