Update base/timer.h code to pass through Location from call sites. (reland)

chrome/browser/extensions/extension_web_socket_proxy_private_api.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/extensions/extension_web_socket_proxy_private_api.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/internal_auth.h"
@@ skipping 41 matching lines @@
     map["extension_id"] = extension_id();
     StringValue* passport = Value::CreateStringValue(
         browser::InternalAuthGeneration::GeneratePassport(
             "web_socket_proxy", map));
     result_.reset(passport);
   }
 #endif  // defined(OS_CHROMEOS)
 
   if (delay_response) {
     const int kTimeout = 3;
-    timer_.Start(base::TimeDelta::FromSeconds(kTimeout),
+    timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeout),
         this, &WebSocketProxyPrivateGetPassportForTCPFunction::Finalize);
   } else {
     Finalize();
   }
   return true;
 }
 
 void WebSocketProxyPrivateGetPassportForTCPFunction::Observe(
     int type, const NotificationSource& source,
     const NotificationDetails& details) {
 #if defined(OS_CHROMEOS)
   DCHECK(type == chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED);
 #else
   NOTREACHED();
 #endif
   timer_.Stop();  // Cancel timeout timer.
   Finalize();
 }
 
 void WebSocketProxyPrivateGetPassportForTCPFunction::Finalize() {
   if (is_finalized_) {
     NOTREACHED();
     return;
   }
   is_finalized_ = true;
   SendResponse(true);
   Release();
 }