Reformatted data_log.
BUG=
Review URL: https://webrtc-codereview.appspot.com/974007
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3221 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/system_wrappers/source/data_log.cc b/webrtc/system_wrappers/source/data_log.cc
index f123896..9bf9650 100644
--- a/webrtc/system_wrappers/source/data_log.cc
+++ b/webrtc/system_wrappers/source/data_log.cc
@@ -8,18 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "data_log.h"
+#include "webrtc/system_wrappers/interface/data_log.h"
#include <assert.h>
-
#include <algorithm>
#include <list>
-#include "critical_section_wrapper.h"
-#include "event_wrapper.h"
-#include "file_wrapper.h"
-#include "rw_lock_wrapper.h"
-#include "thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/data_log_c.cc b/webrtc/system_wrappers/source/data_log_c.cc
index f8d7efd..a11d545 100644
--- a/webrtc/system_wrappers/source/data_log_c.cc
+++ b/webrtc/system_wrappers/source/data_log_c.cc
@@ -8,15 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-/*
- * This is the pure C wrapper of the DataLog class.
- */
+// This is the pure C wrapper of the DataLog class.
-#include "system_wrappers/interface/data_log_c.h"
+#include "webrtc/system_wrappers/interface/data_log_c.h"
#include <string>
-#include "system_wrappers/interface/data_log.h"
+#include "webrtc/system_wrappers/interface/data_log.h"
extern "C" int WebRtcDataLog_CreateLog() {
return webrtc::DataLog::CreateLog();
diff --git a/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c b/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c
index e78a0e3..524bd24 100644
--- a/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c
+++ b/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "system_wrappers/source/data_log_c_helpers_unittest.h"
+#include "webrtc/system_wrappers/source/data_log_c_helpers_unittest.h"
#include <assert.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
-#include "system_wrappers/interface/data_log_c.h"
+#include "webrtc/system_wrappers/interface/data_log_c.h"
enum { kTestArrayLen = 4 };
static const char kTableName[] = "c_wrapper_table";
@@ -31,7 +31,7 @@
}
int WebRtcDataLogCHelper_TestCombine() {
- const int kOutLen = strlen(kTableName) + 4; /* Room for "_17" + '\0' */
+ const int kOutLen = strlen(kTableName) + 4; // Room for "_17" + '\0'
char* combined_name = malloc(kOutLen * sizeof(char));
char* out_ptr = WebRtcDataLog_Combine(combined_name, kOutLen, kTableName, 17);
int return_code = 0;
diff --git a/webrtc/system_wrappers/source/data_log_helpers_unittest.cc b/webrtc/system_wrappers/source/data_log_helpers_unittest.cc
index 94b4d6e..3e430c9 100644
--- a/webrtc/system_wrappers/source/data_log_helpers_unittest.cc
+++ b/webrtc/system_wrappers/source/data_log_helpers_unittest.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "webrtc/system_wrappers/interface/data_log.h"
+
#include <string>
-#include "data_log.h"
#include "gtest/gtest.h"
using ::webrtc::DataLog;
diff --git a/webrtc/system_wrappers/source/data_log_no_op.cc b/webrtc/system_wrappers/source/data_log_no_op.cc
index bedc82a..f5b0ea8 100644
--- a/webrtc/system_wrappers/source/data_log_no_op.cc
+++ b/webrtc/system_wrappers/source/data_log_no_op.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "data_log.h"
+#include "webrtc/system_wrappers/interface/data_log.h"
#include <string>
diff --git a/webrtc/system_wrappers/source/data_log_unittest.cc b/webrtc/system_wrappers/source/data_log_unittest.cc
index c4d6772..ddd0036 100644
--- a/webrtc/system_wrappers/source/data_log_unittest.cc
+++ b/webrtc/system_wrappers/source/data_log_unittest.cc
@@ -8,13 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "webrtc/system_wrappers/interface/data_log.h"
+
#include <map>
#include <string>
-#include "system_wrappers/interface/data_log.h"
-#include "system_wrappers/interface/data_log_c.h"
-#include "system_wrappers/source/data_log_c_helpers_unittest.h"
#include "gtest/gtest.h"
+#include "webrtc/system_wrappers/interface/data_log_c.h"
+#include "webrtc/system_wrappers/source/data_log_c_helpers_unittest.h"
using ::webrtc::DataLog;
@@ -257,9 +258,9 @@
kNumberOfRows),
1);
expected["timestamp,"] = ExpectedValues(
- std::vector<std::string>(string_timestamp,
- string_timestamp +
- kNumberOfRows),
+ std::vector<std::string>(string_timestamp,
+ string_timestamp +
+ kNumberOfRows),
1);
ASSERT_EQ(DataLogParser::VerifyTable(table, expected), 0);
fclose(table);
diff --git a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc
index 9d630b6..583bde6 100644
--- a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc
+++ b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "system_wrappers/interface/data_log.h"
+#include "webrtc/system_wrappers/interface/data_log.h"
#include <cstdio>