Remove unused typemap includes from generated C++ mojo bindings.

mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl

Index: mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
index d33bf4296d2e21750456cce2fdc8411145e0c375..d71185f074087e1111e7d83386a9f45d4ca71acd 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
@@ -36,27 +36,12 @@ namespace {{variant}} {
 #include <stdint.h>
 
 #include <limits>
+{%- if structs or unions %}
 #include <type_traits>
+{%- endif %}
 #include <utility>
 
-#include "base/callback.h"
-#include "base/optional.h"
-#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
-#include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
-#include "mojo/public/cpp/bindings/associated_interface_request.h"
-#include "mojo/public/cpp/bindings/interface_ptr.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/public/cpp/bindings/lib/clone_equals_util.h"
-#include "mojo/public/cpp/bindings/lib/control_message_handler.h"
-#include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
-#include "mojo/public/cpp/bindings/lib/union_accessor.h"
-#include "mojo/public/cpp/bindings/native_struct.h"
-#include "mojo/public/cpp/bindings/raw_ptr_impl_ref_traits.h"
-#include "mojo/public/cpp/bindings/struct_ptr.h"
-#include "mojo/public/cpp/bindings/struct_traits.h"
-#include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h"
-#include "mojo/public/cpp/bindings/union_traits.h"
 #include "{{module.path}}-shared.h"
 {%- for import in imports %}

[yzshen1, 2017/02/02 22:33:58]

I am not quite sure about the criteria what includes should be specified here
and what should be in the .py file. For example, does it make sense to move this
for-block of includes into |public_headers| as well? Or even moving all includes
there?

 {%-   if variant %}
@@ -65,20 +50,9 @@ namespace {{variant}} {
 #include "{{import.module.path}}.h"
 {%-   endif %}
 {%- endfor %}
-{%- if not for_blink %}
-#include <string>
-#include <vector>
-{%- else %}
-{# hash_util.h includes template specializations that should be present for
-   every use of {Inlined}StructPtr. #}
-#include "mojo/public/cpp/bindings/lib/wtf_hash_util.h"
-#include "third_party/WebKit/Source/wtf/HashFunctions.h"
-#include "third_party/WebKit/Source/wtf/Optional.h"
-#include "third_party/WebKit/Source/wtf/text/WTFString.h"
-{%- endif %}
 
-{%- for header in extra_public_headers %}
-#include "{{header}}"
+{%- for header in public_headers %}
+#include {{header}}
 {%- endfor %}
 
 {%- if export_header %}