Move the shared timer to be dynamically allocated.

content/child/webthread_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_WEBTHREAD_IMPL_H_
 #define CONTENT_CHILD_WEBTHREAD_IMPL_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 46 matching lines @@
   virtual void setSharedTimerFiredFunction(
       SharedTimerFunction timerFunction) OVERRIDE;
   virtual void setSharedTimerFireInterval(double interval_seconds) OVERRIDE;
   virtual void stopSharedTimer() OVERRIDE;
 
  private:
   void OnTimeout() {
     if (shared_timer_function_)
       shared_timer_function_();
   }
-  base::OneShotTimer<WebThreadImpl> shared_timer_;
+  // The shared timer is a scoped_ptr, so it can be deleted on the same
+  // thread that created it.
+  scoped_ptr<base::OneShotTimer<WebThreadImpl> > shared_timer_;
   SharedTimerFunction shared_timer_function_;
 
   scoped_ptr<base::Thread> thread_;
 };
 
 class WebThreadImplForMessageLoop : public WebThreadBase {
  public:
   CONTENT_EXPORT explicit WebThreadImplForMessageLoop(
       base::MessageLoopProxy* message_loop);
   CONTENT_EXPORT virtual ~WebThreadImplForMessageLoop();
 
   virtual void postTask(Task* task) OVERRIDE;
   virtual void postDelayedTask(Task* task, long long delay_ms) OVERRIDE;
 
   virtual void enterRunLoop() OVERRIDE;
   virtual void exitRunLoop() OVERRIDE;
 
  private:
   virtual bool isCurrentThread() const OVERRIDE;
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 };
 
 } // namespace content
 
 #endif  // CONTENT_CHILD_WEBTHREAD_IMPL_H_