Remove deprecated TabContentsDelegate::OpenURLFromTab variant

chrome/browser/autocomplete/autocomplete_edit.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 1010 matching lines @@
   DCHECK(suggested_text);
 
   if (in_revert_)
     return false;
 
   InstantController* instant = controller_->GetInstant();
 
   if (!instant)
     return false;
 
+  // It's possible the tab strip does not have an active tab contents, for
+  // instance if the tab has been closed or on return from a sleep state
+  // (http://crbug.com/105689)
   TabContentsWrapper* tab = controller_->GetTabContentsWrapper();
-
   if (!tab)
     return false;
 
   if (user_input_in_progress() && popup_->IsOpen()) {
     return instant->Update(tab, match, view_->GetText(), UseVerbatimInstant(),
                            suggested_text);
-  } else {
-    instant->Hide();
-    return false;
   }
+
+  instant->Hide();
+  return false;
 }
 
 void AutocompleteEditModel::DoPrerender(const AutocompleteMatch& match) {
   // Do not prerender if the destination URL is the same as the current URL.
   if (match.destination_url == PermanentURL())
     return;
+  // It's possible the tab strip does not have an active tab contents, for
+  // instance if the tab has been closed or on return from a sleep state
+  // (http://crbug.com/105689)
   TabContentsWrapper* tab = controller_->GetTabContentsWrapper();
+  if (!tab)
+    return;
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(tab->profile());
   if (prerender_manager) {
     RenderViewHost* current_host = tab->tab_contents()->render_view_host();
     prerender_manager->AddPrerenderFromOmnibox(
         match.destination_url, current_host->session_storage_namespace());
   }
 }
 
 void AutocompleteEditModel::DoPreconnect(const AutocompleteMatch& match) {
@@ skipping 15 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }