Index: ui/base/resource/resource_bundle.cc |
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc |
index b9d9163e872b5eef4b2a1c523de932d963b615c0..5c6d98677d836da88c47b623af076b38409a0244 100644 |
--- a/ui/base/resource/resource_bundle.cc |
+++ b/ui/base/resource/resource_bundle.cc |
@@ -15,7 +15,6 @@ |
#include "base/memory/ref_counted_memory.h" |
#include "base/metrics/histogram.h" |
#include "base/path_service.h" |
-#include "base/profiler/scoped_tracker.h" |
#include "base/stl_util.h" |
#include "base/strings/string_piece.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -454,21 +453,11 @@ base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) const { |
base::StringPiece ResourceBundle::GetRawDataResourceForScale( |
int resource_id, |
ScaleFactor scale_factor) const { |
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed. |
- tracked_objects::ScopedTracker tracking_profile1( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "422489 ResourceBundle::GetRawDataResourceForScale 1")); |
- |
base::StringPiece data; |
if (delegate_ && |
delegate_->GetRawDataResource(resource_id, scale_factor, &data)) |
return data; |
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed. |
- tracked_objects::ScopedTracker tracking_profile2( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "422489 ResourceBundle::GetRawDataResourceForScale 2")); |
- |
if (scale_factor != ui::SCALE_FACTOR_100P) { |
for (size_t i = 0; i < data_packs_.size(); i++) { |
if (data_packs_[i]->GetScaleFactor() == scale_factor && |
@@ -477,10 +466,6 @@ base::StringPiece ResourceBundle::GetRawDataResourceForScale( |
return data; |
} |
} |
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed. |
- tracked_objects::ScopedTracker tracking_profile3( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "422489 ResourceBundle::GetRawDataResourceForScale 3")); |
for (size_t i = 0; i < data_packs_.size(); i++) { |
if ((data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_100P || |