Make Autofill work again on iPads running iOS 9.

ios/chrome/browser/autofill/form_suggestion_controller.mm

 // Copyright 2014 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.
 
 #import "ios/chrome/browser/autofill/form_suggestion_controller.h"
 
+#include "base/ios/ios_util.h"
 #include "base/ios/weak_nsobject.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_block.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/ios/browser/autofill_field_trial_ios.h"
 #import "components/autofill/ios/browser/form_suggestion.h"
 #import "ios/chrome/browser/autofill/form_input_accessory_view_controller.h"
 #import "ios/chrome/browser/autofill/form_suggestion_provider.h"
 #import "ios/chrome/browser/autofill/form_suggestion_view.h"
 #import "ios/chrome/browser/passwords/password_generation_utils.h"
+#include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_state/crw_web_view_proxy.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
 #import "ios/web/public/web_state/web_state.h"
 
 namespace {
 
 // Struct that describes suggestion state.
 struct AutofillSuggestionState {
   AutofillSuggestionState(const std::string& form_name,
@@ skipping 224 matching lines @@
 
 - (void)clearSuggestions {
   // Note that other parts of the suggestionsState are not reset.
   if (!_suggestionState.get())
     return;
   _suggestionState->suggestions.reset([[NSArray alloc] init]);
   [self updateKeyboard:_suggestionState.get()];
 }
 
 - (void)updateKeyboard:(AutofillSuggestionState*)suggestionState {
-  if (!_suggestionState) {
+  if (!suggestionState) {
     if (accessoryViewUpdateBlock_)
       accessoryViewUpdateBlock_.get()(nil, self);
   } else {
-    [self updateKeyboardWithSuggestions:_suggestionState->suggestions];
+    [self updateKeyboardWithSuggestions:suggestionState->suggestions];
   }
 }
 
 - (void)updateKeyboardWithSuggestions:(NSArray*)suggestions {
   if (accessoryViewUpdateBlock_) {
     accessoryViewUpdateBlock_.get()(
         [self suggestionViewWithSuggestions:suggestions], self);
   }
 }
 
 - (UIView*)suggestionViewWithSuggestions:(NSArray*)suggestions {
+  CGRect frame = [_webViewProxy getKeyboardAccessory].frame;
+  // Force the desired height on iPads running iOS 9 or later where the height
+  // of the inputAccessoryView is 0.
+  if (base::ios::IsRunningOnIOS9OrLater() && IsIPadIdiom()) {
+    frame.size.height = autofill::kInputAccessoryHeight;
+  }
   base::scoped_nsobject<FormSuggestionView> view([[FormSuggestionView alloc]
-      initWithFrame:[_webViewProxy getKeyboardAccessory].frame
+      initWithFrame:frame
              client:self
         suggestions:suggestions]);
   return view.autorelease();
 }
 
 - (void)didSelectSuggestion:(FormSuggestion*)suggestion {
   if (!_suggestionState)
     return;
 
   // Send the suggestion to the provider. Upon completion advance the cursor
@@ skipping 58 matching lines @@
         (FormInputAccessoryViewController*)controller {
   accessoryViewUpdateBlock_.reset();
   [self resetSuggestionState];
 }
 
 - (void)resizeAccessoryView {
   [self updateKeyboard:_suggestionState.get()];
 }
 
 @end