| Index: base/tracked_objects.h
|
| diff --git a/base/tracked_objects.h b/base/tracked_objects.h
|
| index 168b17db045a429234c3ae403622a9217adf3ad8..52312f3ead2ca50c925adadea2d0af3a49e36324 100644
|
| --- a/base/tracked_objects.h
|
| +++ b/base/tracked_objects.h
|
| @@ -437,7 +437,7 @@ class BASE_EXPORT ThreadData {
|
| public:
|
| // Current allowable states of the tracking system. The states can vary
|
| // between ACTIVE and DEACTIVATED, but can never go back to UNINITIALIZED.
|
| - enum Status {
|
| + enum ThreadStatus {
|
| UNINITIALIZED, // Pristine, link-time state before running.
|
| DORMANT_DURING_TESTS, // Only used during testing.
|
| DEACTIVATED, // No longer recording profiling.
|
| @@ -519,9 +519,9 @@ class BASE_EXPORT ThreadData {
|
| // Sets internal status_.
|
| // If |status| is false, then status_ is set to DEACTIVATED.
|
| // If |status| is true, then status_ is set to PROFILING_ACTIVE.
|
| - static void InitializeAndSetTrackingStatus(Status status);
|
| + static void InitializeAndSetTrackingStatus(ThreadStatus status);
|
|
|
| - static Status status();
|
| + static ThreadStatus status();
|
|
|
| // Indicate if any sort of profiling is being done (i.e., we are more than
|
| // DEACTIVATED).
|
|
|