Revert 151036 - Speculative revert to see if this change introduced a performance regression on Mac…

chrome/browser/ui/browser_tab_restore_service_delegate.cc

 // Copyright (c) 2012 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/ui/browser_tab_restore_service_delegate.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabrestore.h"
@@ skipping 82 matching lines @@
         Browser::CreateParams::CreateForApp(
             Browser::TYPE_POPUP, app_name, gfx::Rect(), profile));
   }
   if (browser)
     return browser->tab_restore_service_delegate();
   else
     return NULL;
 }
 
 // static
-TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateForController(
-    const NavigationController* controller,
-    int* index) {
-  Browser* browser = browser::FindBrowserForController(controller, index);
-  if (browser)
-    return browser->tab_restore_service_delegate();
-  else
-    return NULL;
+TabRestoreServiceDelegate*
+    TabRestoreServiceDelegate::FindDelegateForWebContents(
+        const WebContents* contents) {
+  Browser* browser = browser::FindBrowserWithWebContents(contents);
+  return browser ? browser->tab_restore_service_delegate() : NULL;
 }
 
 // static
 TabRestoreServiceDelegate* TabRestoreServiceDelegate::FindDelegateWithID(
     SessionID::id_type desired_id) {
   Browser* browser = browser::FindBrowserWithID(desired_id);
-  if (browser)
-    return browser->tab_restore_service_delegate();
-  else
-    return NULL;
+  return browser ? browser->tab_restore_service_delegate() : NULL;
 }