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

Unified Diff: webrtc/test/testsupport/test_output.cc

Issue 2995363002: Replace gflags usages with rtc_base/flags in all targets based on test_main (Closed)
Patch Set: Fix string use after free Created 3 years, 4 months 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
« no previous file with comments | « webrtc/test/test_main.cc ('k') | webrtc/test/testsupport/test_output_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/testsupport/test_output.cc
diff --git a/webrtc/test/testsupport/test_output.cc b/webrtc/test/testsupport/test_output.cc
index aea5110d97d13d8915508702d61046fca73c1497..f9d64b49cf8688a8d51cf3ffdbace3f3071fcd5b 100644
--- a/webrtc/test/testsupport/test_output.cc
+++ b/webrtc/test/testsupport/test_output.cc
@@ -12,32 +12,39 @@
#include <string.h>
-#include "gflags/gflags.h"
#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/flags.h"
#include "webrtc/rtc_base/logging.h"
#include "webrtc/rtc_base/pathutils.h"
#include "webrtc/test/testsupport/fileutils.h"
+namespace {
+const std::string& DefaultOutputPath() {
+ static const std::string path = webrtc::test::OutputPath();
+ return path;
+}
+}
+
DEFINE_string(test_output_dir,
- webrtc::test::OutputPath(),
+ DefaultOutputPath().c_str(),
"The output folder where test output should be saved.");
namespace webrtc {
namespace test {
bool GetTestOutputDir(std::string* out_dir) {
- if (FLAGS_test_output_dir.empty()) {
+ if (strlen(FLAG_test_output_dir) == 0) {
LOG(LS_WARNING) << "No test_out_dir defined.";
return false;
}
- *out_dir = FLAGS_test_output_dir;
+ *out_dir = FLAG_test_output_dir;
return true;
}
bool WriteToTestOutput(const char* filename,
const uint8_t* buffer,
size_t length) {
- if (FLAGS_test_output_dir.empty()) {
+ if (strlen(FLAG_test_output_dir) == 0) {
LOG(LS_WARNING) << "No test_out_dir defined.";
return false;
}
@@ -48,7 +55,7 @@ bool WriteToTestOutput(const char* filename,
}
rtc::File output =
- rtc::File::Create(rtc::Pathname(FLAGS_test_output_dir, filename));
+ rtc::File::Create(rtc::Pathname(FLAG_test_output_dir, filename));
return output.IsOpen() && output.Write(buffer, length) == length;
}
« no previous file with comments | « webrtc/test/test_main.cc ('k') | webrtc/test/testsupport/test_output_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698