Mojo bindings: Fix typemap includes.

mojo/public/cpp/bindings/tests/struct_with_traits_impl_traits.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_H_
-#define MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_TRAITS_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_TRAITS_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/strings/string_piece.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
+#include "mojo/public/cpp/bindings/tests/struct_with_traits_impl.h"
 
 namespace mojo {
-namespace test {
-
-// The mojom types are forward-declared to avoid circular dependencies between
-// this and generated headers.
-class StructWithTraits;
-class StructWithTraits_Reader;
-
-// A type which knows how to look like a mojo::test::StructWithTraits mojom type
-// by way of mojo::StructTraits.
-class StructWithTraitsImpl {
- public:
-  StructWithTraitsImpl();
-  ~StructWithTraitsImpl();
-
-  void set_bool(bool value) { bool_ = value; }
-  bool get_bool() const { return bool_; }
-
-  void set_uint32(uint32_t value) { uint32_ = value; }
-  uint32_t get_uint32() const { return uint32_; }
-
-  void set_uint64(uint64_t value) { uint64_ = value; }
-  uint64_t get_uint64() const { return uint64_; }
-
-  void set_string(std::string value) { string_ = value; }
-  base::StringPiece get_string() const { return string_; }
-
- private:
-  bool bool_ = false;
-  uint32_t uint32_ = 0;
-  uint64_t uint64_ = 0;
-  std::string string_;
-};
-
-}  // namespace test
 
 template <>
 struct StructTraits<test::StructWithTraits, test::StructWithTraitsImpl> {
   // Deserialization to test::StructTraitsImpl.
   static bool Read(test::StructWithTraits_Reader r,
                    test::StructWithTraitsImpl* out);
 
   // Fields in test::StructWithTraits.
   // See src/mojo/public/interfaces/bindings/tests/test_native_types.mojom.
   static bool f_bool(const test::StructWithTraitsImpl& value) {
     return value.get_bool();
   }
 
   static uint32_t f_uint32(const test::StructWithTraitsImpl& value) {
     return value.get_uint32();
   }
 
   static uint64_t f_uint64(const test::StructWithTraitsImpl& value) {
     return value.get_uint64();
   }
 
   static base::StringPiece f_string(const test::StructWithTraitsImpl& value) {
     return value.get_string();
   }
 };
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_TRAITS_H_