diff options
| -rw-r--r-- | chrome/test/base/tracing_browsertest.cc | 2 | ||||
| -rw-r--r-- | content/browser/tracing/tracing_ui.cc | 1 | ||||
| -rw-r--r-- | content/content_resources.grd | 5 | ||||
| -rw-r--r-- | tools/gritsettings/resource_ids | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc index 065f8210..0d05f95 100644 --- a/chrome/test/base/tracing_browsertest.cc +++ b/chrome/test/base/tracing_browsertest.cc @@ -42,7 +42,7 @@ void AddEvents(int num) { TRACE_EVENT_INSTANT0(g_category, g_event); } -IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_BeginTracingWithWatch) { +IN_PROC_BROWSER_TEST_F(TracingBrowserTest, BeginTracingWithWatch) { base::TimeDelta no_timeout; base::TimeDelta short_timeout = base::TimeDelta::FromMilliseconds(5); std::string json_events; diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc index ff1f1ec..b82da36 100644 --- a/content/browser/tracing/tracing_ui.cc +++ b/content/browser/tracing/tracing_ui.cc @@ -46,7 +46,6 @@ WebUIDataSource* CreateTracingHTMLSource() { source->SetJsonPath("strings.js"); source->SetDefaultResource(IDR_TRACING_HTML); source->AddResourcePath("tracing.js", IDR_TRACING_JS); - source->AddLocalizedString("tracingTitle", IDS_TRACING_TITLE); return source; } diff --git a/content/content_resources.grd b/content/content_resources.grd index 799dd12..04ebe89 100644 --- a/content/content_resources.grd +++ b/content/content_resources.grd @@ -10,11 +10,6 @@ </outputs> <translations /> <release seq="1"> - <messages fallback_to_english="true"> - <message name="IDS_TRACING_TITLE" desc="Title for the about:tracing page."> - Tracing - </message> - </messages> <includes> <include name="IDR_GPU_BLACKLIST" file="browser/gpu/software_rendering_list.json" type="BINDATA" /> <include name="IDR_GPU_INTERNALS_HTML" file="browser/resources/gpu/gpu_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 51e03b3..554ec0d 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -184,7 +184,6 @@ }, "content/content_resources.grd": { "includes": [25000], - "messages": [25250], }, "content/shell/shell_resources.grd": { "includes": [25500], |