Merge "Trace Redaction - Clean-up includes" into main

google · Feb 29, 2024 · 7a75c65 · 7a75c65
2 parents 0e0d53c + 7424539
commit 7a75c65
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 12 deletions.
diff --git a/src/trace_redaction/find_package_uid.cc b/src/trace_redaction/find_package_uid.cc
@@ -17,7 +17,9 @@
 #include "src/trace_redaction/find_package_uid.h"
 
 #include "perfetto/ext/base/status_or.h"
-#include "perfetto/ext/base/string_utils.h"
+#include "perfetto/ext/base/string_view.h"
+#include "src/trace_redaction/trace_redaction_framework.h"
+
 #include "protos/perfetto/trace/android/packages_list.pbzero.h"
 #include "protos/perfetto/trace/trace_packet.pbzero.h"
 

diff --git a/src/trace_redaction/find_package_uid.h b/src/trace_redaction/find_package_uid.h
@@ -18,9 +18,10 @@
 #define SRC_TRACE_REDACTION_FIND_PACKAGE_UID_H_
 
 #include "perfetto/ext/base/status_or.h"
-#include "protos/perfetto/trace/trace_packet.pbzero.h"
 #include "src/trace_redaction/trace_redaction_framework.h"
 
+#include "protos/perfetto/trace/trace_packet.pbzero.h"
+
 namespace perfetto::trace_redaction {
 
 // Writes the uid for the package matching `Context.package_name`. Returns

diff --git a/src/trace_redaction/find_package_uid_unittest.cc b/src/trace_redaction/find_package_uid_unittest.cc
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-#include "find_package_uid.h"
+#include "src/trace_redaction/find_package_uid.h"
 
 #include <cstdint>
 #include <string>
 
+#include "src/base/test/status_matchers.h"
+#include "test/gtest_and_gmock.h"
+
 #include "protos/perfetto/trace/android/packages_list.gen.h"
 #include "protos/perfetto/trace/ps/process_tree.gen.h"
-#include "protos/perfetto/trace/ps/process_tree.pbzero.h"
 #include "protos/perfetto/trace/trace_packet.gen.h"
-#include "src/base/test/status_matchers.h"
-#include "test/gtest_and_gmock.h"
 
 namespace perfetto::trace_redaction {
 

diff --git a/src/trace_redaction/prune_package_list.cc b/src/trace_redaction/prune_package_list.cc
@@ -16,7 +16,12 @@
 
 #include "src/trace_redaction/prune_package_list.h"
 
+#include <string>
+
+#include "perfetto/base/status.h"
+
 #include "protos/perfetto/trace/android/packages_list.gen.h"
+#include "protos/perfetto/trace/trace_packet.gen.h"
 
 namespace perfetto::trace_redaction {
 

diff --git a/src/trace_redaction/prune_package_list.h b/src/trace_redaction/prune_package_list.h
@@ -19,6 +19,7 @@
 
 #include <string>
 
+#include "perfetto/base/status.h"
 #include "src/trace_redaction/trace_redaction_framework.h"
 
 namespace perfetto::trace_redaction {

diff --git a/src/trace_redaction/prune_package_list_unittest.cc b/src/trace_redaction/prune_package_list_unittest.cc
@@ -16,13 +16,15 @@
  */
 
 #include <cstdint>
+#include <memory>
 #include <string>
 
+#include "src/trace_redaction/prune_package_list.h"
+#include "test/gtest_and_gmock.h"
+
 #include "protos/perfetto/trace/android/packages_list.gen.h"
 #include "protos/perfetto/trace/ps/process_tree.gen.h"
 #include "protos/perfetto/trace/trace_packet.gen.h"
-#include "src/trace_redaction/prune_package_list.h"
-#include "test/gtest_and_gmock.h"
 
 namespace perfetto::trace_redaction {
 

diff --git a/src/trace_redaction/scrub_trace_packet.cc b/src/trace_redaction/scrub_trace_packet.cc
@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
+#include <string>
+
 #include "src/trace_redaction/scrub_trace_packet.h"
 
+#include "perfetto/base/status.h"
+
 namespace perfetto::trace_redaction {
 // The TracePacket message has a simple structure. At its core its one sub
 // message (e.g. ProcessTree) and some additional context (e.g. timestamp).

diff --git a/src/trace_redaction/scrub_trace_packet.h b/src/trace_redaction/scrub_trace_packet.h
@@ -19,8 +19,6 @@
 
 #include "src/trace_redaction/trace_redaction_framework.h"
 
-#include "protos/perfetto/trace/trace_packet.pbzero.h"
-
 namespace perfetto::trace_redaction {
 
 // Drops whole trace packets based on an allow-list (e.g. retain ProcessTree

diff --git a/src/trace_redaction/scrub_trace_packet_unittest.cc b/src/trace_redaction/scrub_trace_packet_unittest.cc
@@ -21,6 +21,7 @@
 #include "test/gtest_and_gmock.h"
 
 #include "protos/perfetto/trace/ps/process_tree.gen.h"
+#include "protos/perfetto/trace/trace_packet.gen.h"
 #include "protos/perfetto/trace/trace_packet.pbzero.h"
 
 namespace perfetto::trace_redaction {

diff --git a/src/trace_redaction/trace_redaction_framework.h b/src/trace_redaction/trace_redaction_framework.h
@@ -20,12 +20,11 @@
 #include <cstdint>
 #include <optional>
 #include <string>
-#include <vector>
 
 #include "perfetto/base/flat_set.h"
+#include "perfetto/base/status.h"
 #include "perfetto/ext/base/status_or.h"
 
-#include "protos/perfetto/trace/trace_packet.gen.h"
 #include "protos/perfetto/trace/trace_packet.pbzero.h"
 
 namespace perfetto::trace_redaction {

diff --git a/src/trace_redaction/trace_redactor.h b/src/trace_redaction/trace_redactor.h
@@ -17,8 +17,12 @@
 #ifndef SRC_TRACE_REDACTION_TRACE_REDACTOR_H_
 #define SRC_TRACE_REDACTION_TRACE_REDACTOR_H_
 
+#include <memory>
+#include <string>
 #include <string_view>
+#include <vector>
 
+#include "perfetto/base/status.h"
 #include "perfetto/trace_processor/trace_blob_view.h"
 #include "src/trace_redaction/trace_redaction_framework.h"
 

diff --git a/src/trace_redaction/trace_redactor_integrationtest.cc b/src/trace_redaction/trace_redactor_integrationtest.cc
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+#include <memory>
+#include <string>
+#include <string_view>
+#include <vector>
+
 #include "perfetto/ext/base/file_utils.h"
 #include "perfetto/ext/base/temp_file.h"
 #include "src/base/test/utils.h"