Revert 54560 - ...

chrome/browser/extensions/extension_dom_ui.cc

 // Copyright (c) 2010 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/extensions/extension_dom_ui.h"
 
 #include <set>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 158 matching lines @@
                                          int request_id,
                                          bool has_callback) {
   extension_function_dispatcher_->HandleRequest(message,
                                                 content,
                                                 source_url,
                                                 request_id,
                                                 has_callback);
 }
 
 Browser* ExtensionDOMUI::GetBrowser() const {
-  // TODO(beng): This is an improper direct dependency on Browser. Route this
-  // through some sort of delegate.
-  return BrowserList::FindBrowserWithProfile(DOMUI::GetProfile());
+  Browser* browser = NULL;
+  TabContentsDelegate* tab_contents_delegate = tab_contents()->delegate();
+  if (tab_contents_delegate)
+    browser = tab_contents_delegate->GetBrowser();
+
+  return browser;
 }
 
 Profile* ExtensionDOMUI::GetProfile() {
   return DOMUI::GetProfile();
 }
 
 gfx::NativeWindow ExtensionDOMUI::GetCustomFrameNativeWindow() {
   if (GetBrowser())
     return NULL;
 
@@ skipping 189 matching lines @@
 }
 
 // static
 void ExtensionDOMUI::GetFaviconForURL(Profile* profile,
     FaviconService::GetFaviconRequest* request, const GURL& page_url) {
   // tracker deletes itself when done.
   ExtensionDOMUIImageLoadingTracker* tracker =
       new ExtensionDOMUIImageLoadingTracker(profile, request, page_url);
   tracker->Init();
 }