commit 7f48021e1d4f383115a718d6c4bfb7578c744733
author James Robinson <jamesr@chromium.org> Fri Oct 31 10:28:08 2014 -0700
committer James Robinson <jamesr@chromium.org> Fri Oct 31 10:28:08 2014 -0700
tree 94fea0c4bd0470b1e68a2802f24ebed892617d42
parent 7c05714462a1f2c668dd3946d953cc36aa685bfc

Update from chromium https://crrev.com/302282

Updates based on chromium https://crrev.com/302282 /
30228db41b946899ce33f284da0adf2b35188d552de47. Contains updates for
https://crrev.com/301916 and https://crrev.com/301795.

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/683113005

net/base/upload_file_element_reader.cc

diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc
index 857bef2..4682466 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
-#include "base/profiler/scoped_profile.h"
+#include "base/profiler/scoped_tracker.h"
 #include "base/task_runner_util.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
@@ -104,8 +104,8 @@
 void UploadFileElementReader::OnOpenCompleted(
     const CompletionCallback& callback,
     int result) {
-  // TODO(vadimt): Remove ScopedProfile below once crbug.com/423948 is fixed.
-  tracked_objects::ScopedProfile tracking_profile(
+  // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
+  tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "423948 UploadFileElementReader::OnOpenCompleted"));