1 files changed, 5 insertions, 91 deletions

diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc
index 5b5ea2a..f63d4fd 100644
--- a/chrome/browser/extensions/extension_function.cc
+++ b/chrome/browser/extensions/extension_function.cc
@@ -8,18 +8,11 @@
 #include "base/metrics/histogram.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/window_controller.h"
-#include "chrome/browser/extensions/window_controller_list.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/api/extension_api.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
-#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -154,10 +147,7 @@ void ExtensionFunction::SendResponseImpl(bool success) {
 }
 
 UIThreadExtensionFunction::UIThreadExtensionFunction()
-    : render_view_host_(NULL),
-      profile_(NULL),
-      delegate_(NULL) {
-}
+    : render_view_host_(NULL), context_(NULL), delegate_(NULL) {}
 
 UIThreadExtensionFunction::~UIThreadExtensionFunction() {
   if (dispatcher() && render_view_host())
@@ -184,88 +174,12 @@ void UIThreadExtensionFunction::SetRenderViewHost(
   tracker_.reset(render_view_host ? new RenderViewHostTracker(this) : NULL);
 }
 
-// TODO(stevenjb): Replace this with GetExtensionWindowController().
-Browser* UIThreadExtensionFunction::GetCurrentBrowser() {
-  // If the delegate has an associated browser, return it.
-  if (dispatcher()) {
-    extensions::WindowController* window_controller =
-        dispatcher()->delegate()->GetExtensionWindowController();
-    if (window_controller) {
-      Browser* browser = window_controller->GetBrowser();
-      if (browser)
-        return browser;
-    }
-  }
-
-  // Otherwise, try to default to a reasonable browser. If |include_incognito_|
-  // is true, we will also search browsers in the incognito version of this
-  // profile. Note that the profile may already be incognito, in which case
-  // we will search the incognito version only, regardless of the value of
-  // |include_incognito|. Look only for browsers on the active desktop as it is
-  // preferable to pretend no browser is open then to return a browser on
-  // another desktop.
-  if (render_view_host_) {
-    Profile* profile = Profile::FromBrowserContext(
-        render_view_host_->GetProcess()->GetBrowserContext());
-    Browser* browser = chrome::FindAnyBrowser(profile, include_incognito_,
-                                              chrome::GetActiveDesktop());
-    if (browser)
-      return browser;
-  }
-
-  // NOTE(rafaelw): This can return NULL in some circumstances. In particular,
-  // a background_page onload chrome.tabs api call can make it into here
-  // before the browser is sufficiently initialized to return here, or
-  // all of this profile's browser windows may have been closed.
-  // A similar situation may arise during shutdown.
-  // TODO(rafaelw): Delay creation of background_page until the browser
-  // is available. http://code.google.com/p/chromium/issues/detail?id=13284
-  return NULL;
-}
-
 content::WebContents* UIThreadExtensionFunction::GetAssociatedWebContents() {
-  if (dispatcher()) {
-    content::WebContents* web_contents =
-        dispatcher()->delegate()->GetAssociatedWebContents();
-    if (web_contents)
-      return web_contents;
-  }
-
-  Browser* browser = GetCurrentBrowser();
-  if (!browser)
-    return NULL;
-  return browser->tab_strip_model()->GetActiveWebContents();
-}
-
-extensions::WindowController*
-UIThreadExtensionFunction::GetExtensionWindowController() {
-  // If the delegate has an associated window controller, return it.
-  if (dispatcher()) {
-    extensions::WindowController* window_controller =
-        dispatcher()->delegate()->GetExtensionWindowController();
-    if (window_controller)
-      return window_controller;
-  }
-
-  return extensions::WindowControllerList::GetInstance()->
-      CurrentWindowForFunction(this);
-}
-
-bool UIThreadExtensionFunction::CanOperateOnWindow(
-    const extensions::WindowController* window_controller) const {
-  const extensions::Extension* extension = GetExtension();
-  // |extension| is NULL for unit tests only.
-  if (extension != NULL && !window_controller->IsVisibleToExtension(extension))
-    return false;
-
-  if (profile() == window_controller->profile())
-    return true;
-
-  if (!include_incognito())
-    return false;
+  content::WebContents* web_contents = NULL;
+  if (dispatcher())
+    web_contents = dispatcher()->delegate()->GetAssociatedWebContents();
 
-  return profile()->HasOffTheRecordProfile() &&
-      profile()->GetOffTheRecordProfile() == window_controller->profile();
+  return web_contents;
 }
 
 void UIThreadExtensionFunction::SendResponse(bool success) {