Move the shared timer to be dynamically allocated.

content/child/webthread_impl.cc

 // 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.
 
 // An implementation of WebThread in terms of base::MessageLoop and
 // base::Thread
 
 #include <math.h>
 
 #include "content/child/webthread_impl.h"
@@ skipping 75 matching lines @@
   thread_->message_loop()->Quit();
 }
 
 bool WebThreadImpl::isCurrentThread() const {
   return thread_->thread_id() == base::PlatformThread::CurrentId();
 }
 
 void WebThreadImpl::setSharedTimerFiredFunction(
     SharedTimerFunction timerFunction) {
   shared_timer_function_ = timerFunction;
+  if (shared_timer_function_ != NULL)
+    shared_timer_.reset(new base::OneShotTimer<WebThreadImpl>());
+  else
+    shared_timer_.reset(NULL);
 }
 
 void WebThreadImpl::setSharedTimerFireInterval(double interval_seconds) {
+  DCHECK(shared_timer_function_);
+
   // See BlinkPlatformImpl::setSharedTimerFireInterval for explanation of
   // why ceil is used in the interval calculation.
   int64 interval = static_cast<int64>(
       ceil(interval_seconds * base::Time::kMillisecondsPerSecond)
       * base::Time::kMicrosecondsPerMillisecond);
 
   if (interval < 0)
     interval = 0;
 
-  shared_timer_.Stop();
-  shared_timer_.Start(FROM_HERE, base::TimeDelta::FromMicroseconds(interval),
+  shared_timer_->Stop();
+  shared_timer_->Start(FROM_HERE, base::TimeDelta::FromMicroseconds(interval),
                       this, &WebThreadImpl::OnTimeout);
 }
 
 void WebThreadImpl::stopSharedTimer() {
-  shared_timer_.Stop();
+  DCHECK(shared_timer_function_);
+  shared_timer_->Stop();
 }
 
 WebThreadImpl::~WebThreadImpl() {
   thread_->Stop();
 }
 
 WebThreadImplForMessageLoop::WebThreadImplForMessageLoop(
     base::MessageLoopProxy* message_loop)
     : message_loop_(message_loop) {}
 
@@ skipping 23 matching lines @@
   base::MessageLoop::current()->Quit();
 }
 
 bool WebThreadImplForMessageLoop::isCurrentThread() const {
   return message_loop_->BelongsToCurrentThread();
 }
 
 WebThreadImplForMessageLoop::~WebThreadImplForMessageLoop() {}
 
 }  // namespace content