| Index: test/protos/dart_options.proto | 
| diff --git a/test/protos/dart_options.proto b/test/protos/dart_options.proto | 
| index 8db390775f2f7e9865000eaf6fc1957bd8e40cc1..aa9942ef069bde67407eac0a0727f78c94f2c62b 100644 | 
| --- a/test/protos/dart_options.proto | 
| +++ b/test/protos/dart_options.proto | 
| @@ -12,14 +12,16 @@ import "descriptor_2_5_opensource.proto"; | 
|  | 
| extend google.protobuf.FileOptions { | 
|  | 
| -  // If true, GeneratedMessage subclasses should implement Map. | 
| -  // (May be overridden by the "implement_map" option on a message.) | 
| -  optional bool implement_map_by_default = 95333044; | 
| +  // Applies the named mixin to all messages in this file. | 
| +  // (May be overridden by the "mixin" option on a message.) | 
| +  // For now, "PbMapMixin" is the only available mixin. | 
| +  optional string default_mixin = 96128839; | 
| } | 
|  | 
| extend google.protobuf.MessageOptions { | 
|  | 
| -  // If true, the corresponding GenerateMessage subclass should implement Map. | 
| -  // (It can also be set to false to override implement_map_by_default.) | 
| -  optional bool implement_map = 95333044; | 
| +  // Applies the named mixin. | 
| +  // For now, "PbMapMixin" is the only available mixin. | 
| +  // The empty string can be used to turn off mixins for this message. | 
| +  optional string mixin = 96128839; | 
| } | 
|  |