Revert 120789 - Propogate status setting for profiler to track parents

content/browser/profiler_controller_impl.h

Index: content/browser/profiler_controller_impl.h
===================================================================
--- content/browser/profiler_controller_impl.h	(revision 120816)
+++ content/browser/profiler_controller_impl.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,7 +6,6 @@
 #define CONTENT_BROWSER_PROFILER_CONTROLLER_IMPL_H_
 
 #include "base/memory/singleton.h"
-#include "base/tracked_objects.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/profiler_controller.h"
 
@@ -35,8 +34,7 @@
   virtual void Register(ProfilerSubscriber* subscriber) OVERRIDE;
   virtual void Unregister(ProfilerSubscriber* subscriber) OVERRIDE;
   virtual void GetProfilerData(int sequence_number) OVERRIDE;
-  virtual void SetProfilerStatus(
-      tracked_objects::ThreadData::Status status) OVERRIDE;
+  virtual void SetProfilerStatus(bool enable) OVERRIDE;
 
  private:
   friend struct DefaultSingletonTraits<ProfilerControllerImpl>;
@@ -45,8 +43,7 @@
   void GetProfilerDataFromChildProcesses(int sequence_number);
 
   // Contact child processes and set profiler status to |enable|.
-  void SetProfilerStatusInChildProcesses(
-      tracked_objects::ThreadData::Status status);
+  void SetProfilerStatusInChildProcesses(bool enable);
 
   ProfilerSubscriber* subscriber_;
 
Property changes on: content/browser/profiler_controller_impl.h
___________________________________________________________________
Added: svn:mergeinfo