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

base/profiler/scoped_profile.h

 // 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.
 
 
 #ifndef BASE_PROFILER_SCOPED_PROFILE_H_
 #define BASE_PROFILER_SCOPED_PROFILE_H_
 
 //------------------------------------------------------------------------------
 // ScopedProfile provides basic helper functions for profiling a short
@@ skipping 17 matching lines @@
 #define TRACK_RUN_IN_THIS_SCOPED_REGION(dispatch_function_name)                \
     ::tracked_objects::ScopedProfile LINE_BASED_VARIABLE_NAME_FOR_PROFILING(   \
         FROM_HERE_WITH_EXPLICIT_FUNCTION(#dispatch_function_name))
 
 
 namespace tracked_objects {
 class Births;
 
 class BASE_EXPORT ScopedProfile {
  public:
+  // Mode of operation. Specifies whether ScopedProfile should be a no-op or
+  // needs to create and tally a task.
+  enum Mode {
+    DISABLED,  // Do nothing.
+    ENABLED    // Create and tally a task.
+  };
+
+  // TODO(vadimt): Remove this constructor.
   explicit ScopedProfile(const Location& location);
+  ScopedProfile(const Location& location, Mode mode);
   ~ScopedProfile();
 
-  // Stop tracing prior to the end destruction of the instance.
-  void StopClockAndTally();
-
  private:
   Births* birth_;  // Place in code where tracking started.
   TaskStopwatch stopwatch_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedProfile);
 };
 
 }  // namespace tracked_objects
 
 #endif   // BASE_PROFILER_SCOPED_PROFILE_H_