Remove spurious STL header includes from ppapi

Remove a bunch of unused includes. Then add includes as needed to fix the build. Change-Id: Id30743cfb6db3473b30c5357f359a6e92f687057 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4582744 Reviewed-by: Derek Schuff <dschuff@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> Cr-Commit-Position: refs/heads/main@{#1156401}
Denger-Network · Jun 12, 2023 · c282611 · c282611
1 parent 209393c
commit c282611
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 22 deletions.
diff --git a/ppapi/cpp/file_ref.h b/ppapi/cpp/file_ref.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_FILE_REF_H_
 #define PPAPI_CPP_FILE_REF_H_
 
+#include <vector>
+
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/ppb_file_ref.h"

diff --git a/ppapi/cpp/input_event.h b/ppapi/cpp/input_event.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include <string>
+#include <utility>
 #include <vector>
 
 #include "ppapi/c/ppb_input_event.h"

diff --git a/ppapi/cpp/private/var_private.h b/ppapi/cpp/private/var_private.h
@@ -7,6 +7,9 @@
 
 #include <stdint.h>
 
+#include <string>
+#include <vector>
+
 #include "ppapi/cpp/var.h"
 
 namespace pp {

diff --git a/ppapi/cpp/var.h b/ppapi/cpp/var.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <string>
-#include <vector>
 
 #include "ppapi/c/pp_var.h"
 #include "ppapi/cpp/pass_ref.h"

diff --git a/ppapi/proxy/dispatcher.h b/ppapi/proxy/dispatcher.h
@@ -5,9 +5,7 @@
 #ifndef PPAPI_PROXY_DISPATCHER_H_
 #define PPAPI_PROXY_DISPATCHER_H_
 
-#include <set>
-#include <string>
-#include <vector>
+#include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_refptr.h"

diff --git a/ppapi/proxy/file_io_resource.h b/ppapi/proxy/file_io_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <memory>
-#include <string>
 
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"

diff --git a/ppapi/proxy/file_ref_resource.h b/ppapi/proxy/file_ref_resource.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include <string>
+#include <vector>
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"

diff --git a/ppapi/proxy/plugin_var_tracker.h b/ppapi/proxy/plugin_var_tracker.h
@@ -6,7 +6,6 @@
 #define PPAPI_PROXY_PLUGIN_VAR_TRACKER_H_
 
 #include <map>
-#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_refptr.h"

diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -7,8 +7,6 @@
 
 #include <stdint.h>
 
-#include <vector>
-
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
 #include "ppapi/c/pp_graphics_3d.h"

diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <string>
-#include <vector>
 
 #include "build/build_config.h"
 #include "ppapi/c/pp_instance.h"

diff --git a/ppapi/proxy/ppp_printing_proxy.h b/ppapi/proxy/ppp_printing_proxy.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include <string>
 #include <vector>
 
 #include "ppapi/c/dev/ppp_printing_dev.h"

diff --git a/ppapi/proxy/serialized_handle.h b/ppapi/proxy/serialized_handle.h
@@ -7,8 +7,7 @@
 
 #include <stdint.h>
 
-#include <string>
-#include <vector>
+#include <utility>
 
 #include "base/atomicops.h"
 #include "base/check_op.h"

diff --git a/ppapi/shared_impl/ppb_video_decoder_shared.h b/ppapi/shared_impl/ppb_video_decoder_shared.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <map>
-#include <vector>
 
 #include "base/compiler_specific.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"

diff --git a/ppapi/shared_impl/tracked_callback.h b/ppapi/shared_impl/tracked_callback.h
@@ -7,9 +7,7 @@
 
 #include <stdint.h>
 
-#include <map>
 #include <memory>
-#include <set>
 
 #include "base/functional/callback.h"
 #include "base/memory/ref_counted.h"

diff --git a/ppapi/tests/test_crypto.h b/ppapi/tests/test_crypto.h
@@ -6,7 +6,6 @@
 #define PPAPI_TESTS_TEST_CRYPTO_H_
 
 #include <string>
-#include <vector>
 
 #include "ppapi/c/dev/ppb_crypto_dev.h"
 #include "ppapi/tests/test_case.h"

diff --git a/ppapi/tests/test_cursor_control.h b/ppapi/tests/test_cursor_control.h
@@ -6,7 +6,6 @@
 #define PPAPI_TESTS_TEST_CURSOR_CONTROL_H_
 
 #include <string>
-#include <vector>
 
 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "ppapi/tests/test_case.h"

diff --git a/ppapi/tests/test_input_event.h b/ppapi/tests/test_input_event.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <string>
-#include <vector>
 
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/c/private/ppb_testing_private.h"

diff --git a/ppapi/tests/test_message_handler.h b/ppapi/tests/test_message_handler.h
@@ -6,7 +6,6 @@
 #define PPAPI_TESTS_TEST_MESSAGE_HANDLER_H_
 
 #include <string>
-#include <vector>
 
 #include "ppapi/c/ppb_messaging.h"
 #include "ppapi/tests/test_case.h"

diff --git a/ppapi/thunk/ppb_video_capture_api.h b/ppapi/thunk/ppb_video_capture_api.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <string>
-#include <vector>
 
 #include "base/memory/scoped_refptr.h"
 #include "ppapi/c/dev/ppb_video_capture_dev.h"