Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4811)

Unified Diff: chrome/test/automation/automation_proxy.cc

Issue 67683003: Remove TraceController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/automation/automation_proxy.cc
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 1c8cdb233b4af2e63c5ca2b927200d4ecc45305f..aae6691b5b025ce5337948d3fd430b9b25243a94 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -7,7 +7,7 @@
#include <sstream>
#include "base/basictypes.h"
-#include "base/debug/trace_event.h"
+#include "base/file_util.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/waitable_event.h"
@@ -410,31 +410,13 @@ bool AutomationProxy::BeginTracing(const std::string& category_patterns) {
bool AutomationProxy::EndTracing(std::string* json_trace_output) {
bool success = false;
- size_t num_trace_chunks = 0;
- if (!Send(new AutomationMsg_EndTracing(&num_trace_chunks, &success)) ||
- !success)
+ base::FilePath path;
+ if (!Send(new AutomationMsg_EndTracing(&path, &success)) || !success)
return false;
- std::string chunk;
- base::debug::TraceResultBuffer buffer;
- base::debug::TraceResultBuffer::SimpleOutput output;
- buffer.SetOutputCallback(output.GetCallback());
-
- // TODO(jbates): See bug 100255, IPC send fails if message is too big. This
- // code can be simplified if that limitation is fixed.
- // Workaround IPC payload size limitation by getting chunks.
- buffer.Start();
- for (size_t i = 0; i < num_trace_chunks; ++i) {
- // The broswer side AutomationProvider resets state at BeginTracing,
- // so it can recover even after this fails mid-way.
- if (!Send(new AutomationMsg_GetTracingOutput(&chunk, &success)) ||
- !success)
- return false;
- buffer.AddFragment(chunk);
- }
- buffer.Finish();
-
- *json_trace_output = output.json_output;
+ bool ok = base::ReadFileToString(path, json_trace_output);
+ DCHECK(ok);
+ base::DeleteFile(path, false);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698