Switch some fields in omnibox.mojom to non-nullable.

chrome/browser/ui/webui/omnibox/omnibox.mojom

Index: chrome/browser/ui/webui/omnibox/omnibox.mojom
diff --git a/chrome/browser/ui/webui/omnibox/omnibox.mojom b/chrome/browser/ui/webui/omnibox/omnibox.mojom
index 096c8a79a9e7e9d04cf69e3498693475382b202e..81736526472bae6b20092db05b745e74511cbb44 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox.mojom
+++ b/chrome/browser/ui/webui/omnibox/omnibox.mojom
@@ -5,8 +5,8 @@
 // The structures here roughly mirror those from autocomplete.
 
 struct AutocompleteAdditionalInfo {
-  string? key;
-  string? value;
+  string key;
+  string value;
 };
 
 struct AutocompleteMatchMojo {
@@ -15,40 +15,43 @@ struct AutocompleteMatchMojo {
   bool provider_done;
   int32 relevance;
   bool deletable;
-  string? fill_into_edit;
-  string? inline_autocompletion;
-  string? destination_url;
-  string? contents;
-  string? description;
+  string fill_into_edit;
+  string inline_autocompletion;
+  string destination_url;
+  string contents;
+  string description;
   int32 transition;
   bool is_history_what_you_typed_match;
   bool allowed_to_be_default_match;
-  string? type;
+  string type;
   string? associated_keyword;
-  string? keyword;
+  string keyword;
   bool starred;
   int32 duplicates;
   bool from_previous;
-  AutocompleteAdditionalInfo?[]? additional_info;
+  AutocompleteAdditionalInfo[] additional_info;
 };
 
 struct AutocompleteResultsForProviderMojo {
-  string? provider_name;
-  AutocompleteMatchMojo?[]? results;
+  string provider_name;
+  AutocompleteMatchMojo[] results;
 };
 
 struct OmniboxResultMojo {
   bool done;
   // Time delta since the request was started, in milliseconds.
   int32 time_since_omnibox_started_ms;
-  string? host;
+  string host;
   bool is_typed_host;
-  AutocompleteMatchMojo?[]? combined_results;
-  AutocompleteResultsForProviderMojo?[]? results_by_provider;
+  AutocompleteMatchMojo[] combined_results;
+  AutocompleteResultsForProviderMojo[] results_by_provider;
 };
 
 [Client=OmniboxPage]
 interface OmniboxUIHandlerMojo {
+  // TODO(yzshen): Conceptually |input_string| could be non-nullable. However,

[yzshen1, 2014/08/25 20:25:32]

I have reported this bug to the author.

I am fine if you would like me to hold off this patch till the bug is resolved
(so that I don't need to send you a follow-up patch to remove the nullable flag
and the TODO).

Please let me know. Thanks!

+  // crbug.com/407258 (JavaScript encoder encodes empty string as null) prevents
+  // us from doing so. Change it into non-nullable once the bug is resolved.
   StartOmniboxQuery(string? input_string,
                     int32 cursor_position,
                     bool prevent_inline_autocomplete,
@@ -57,5 +60,5 @@ interface OmniboxUIHandlerMojo {
 };
 
 interface OmniboxPage {
-  HandleNewAutocompleteResult(OmniboxResultMojo? result);
+  HandleNewAutocompleteResult(OmniboxResultMojo result);
 };