Mojo: Simplify typemap usage.

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

Index: mojo/public/cpp/bindings/tests/rect_chromium_traits.h
diff --git a/mojo/public/cpp/bindings/tests/rect_chromium_traits.h b/mojo/public/cpp/bindings/tests/rect_chromium_traits.h
index 72c083891482f6ff4c3daff5f021a5c579c58249..252de72d5172e77dc4afe03f2c2072f18eef591e 100644
--- a/mojo/public/cpp/bindings/tests/rect_chromium_traits.h
+++ b/mojo/public/cpp/bindings/tests/rect_chromium_traits.h
@@ -7,19 +7,18 @@
 
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "mojo/public/cpp/bindings/tests/rect_chromium.h"
-#include "mojo/public/interfaces/bindings/tests/rect.mojom-chromium.h"
+#include "mojo/public/interfaces/bindings/tests/rect.mojom.h"
 
 namespace mojo {
 
 template <>
-struct StructTraits<test::chromium::TypemappedRect, test::RectChromium> {
+struct StructTraits<test::TypemappedRect, test::RectChromium> {
   static int x(const test::RectChromium& r) { return r.x(); }
   static int y(const test::RectChromium& r) { return r.y(); }
   static int width(const test::RectChromium& r) { return r.width(); }
   static int height(const test::RectChromium& r) { return r.height(); }
 
-  static bool Read(test::chromium::TypemappedRect::Reader r,
-                   test::RectChromium* out) {
+  static bool Read(test::TypemappedRect::Reader r, test::RectChromium* out) {
     if (r.width() < 0 || r.height() < 0)
       return false;
     out->set_x(r.x());