Mojom compiler: Move RuntimeTypeInfo from mojom_files.mojom to mojom_types.mojom.

mojom/mojom_parser/serialization/serialization.go

 // Copyright 2015 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.
 
 package serialization
 
 import (
         "fmt"
         "mojo/public/go/bindings"
         "mojom/mojom_parser/generated/mojom_files"
@@ skipping 111 matching lines @@
                 if len(*file.Imports) == 0 {
                         // If we are in a mode where canonical file names are not being resolved
                         // then emit a null value for |imports| rather than an empty array.
                         file.Imports = nil
                 }
         }
 
         // We will populate a RuntimeTypeInfo structure and then serialize it and
         // the serialized bytes will form the |serialized_runtime_type_info| field
         // of the MojomFile.
-        typeInfo := mojom_files.RuntimeTypeInfo{}
-        typeInfo.ServicesByName = make(map[string]mojom_files.ServiceTypeInfo)
+        typeInfo := mojom_types.RuntimeTypeInfo{}
+        typeInfo.ServicesByName = make(map[string]mojom_types.ServiceTypeInfo)
         typeInfo.TypeMap = make(map[string]mojom_types.UserDefinedType)
 
         // We populate the declared_mojom_objects field
         // and simultaneously we populate typeInfo.TypeMap.
 
         // Interfaces
         if f.Interfaces != nil && len(f.Interfaces) > 0 {
                 file.DeclaredMojomObjects.Interfaces = new([]string)
                 for _, intrfc := range f.Interfaces {
                         typeKey := intrfc.TypeKey()
@@ skipping 70 matching lines @@
                 }
                 file.SerializedRuntimeTypeInfo = &bytes
         }
 
         return
 }
 
 // addServiceTypeInfo will add a ServiceTypeInfo to the ServicesByName field of |typeInfo| corresponding
 // to |intrfc| if |intrfc| is a top-level interface, meaning that it has a non-nil service name. In that
 // case this method returns true. Otherwise this method will do nothing and return fals.
-func addServiceTypeInfo(intrfc *mojom.MojomInterface, typeInfo *mojom_files.RuntimeTypeInfo) (isTopLevel bool) {
+func addServiceTypeInfo(intrfc *mojom.MojomInterface, typeInfo *mojom_types.RuntimeTypeInfo) (isTopLevel bool) {
         isTopLevel = intrfc.ServiceName != nil
         if isTopLevel {
-                serviceTypeInfo := mojom_files.ServiceTypeInfo{}
+                serviceTypeInfo := mojom_types.ServiceTypeInfo{}
                 serviceTypeInfo.TopLevelInterface = intrfc.TypeKey()
                 serviceTypeInfo.CompleteTypeSet = intrfc.FindReachableTypes()
                 typeInfo.ServicesByName[*intrfc.ServiceName] = serviceTypeInfo
         }
         return
 }
 
 // translateUserDefinedType translates from a mojom.UserDefinedType (the pure Go
 // representation used by the parser) to a mojom_types.UserDefinedType (the
 // Mojo Go representation used for serialization.)
@@ skipping 430 matching lines @@
 
 // stringPointer is a convenience function for creating a pointer to a string whose value
 // is the specified string. It may be used in situations where the compiler will
 // not allow you to take the address of a string value directly, such as the
 // return value of a function. It is necessary to create pointers to strings because
 // that is how the Mojom type |string?| (i.e. nullable string) is represented in
 // in the Mojom Go bindings.
 func stringPointer(s string) *string {
         return &s
 }