Revert 151353 - Panels refactor: Support browserless panels on Linux.

chrome/browser/ui/panels/panel_host.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/panels/panel_host.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/panels/panel.h"
-#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
@@ skipping 22 matching lines @@
     return;
 
   web_contents_.reset(content::WebContents::Create(
       profile_, content::SiteInstance::CreateForURL(profile_, url),
       MSG_ROUTING_NONE, NULL, NULL));
   chrome::SetViewType(web_contents_.get(), chrome::VIEW_TYPE_PANEL);
   web_contents_->SetDelegate(this);
   content::WebContentsObserver::Observe(web_contents_.get());
 
   favicon_tab_helper_.reset(new FaviconTabHelper(web_contents_.get()));
-  prefs_tab_helper_.reset(new PrefsTabHelper(web_contents_.get()));
 
   web_contents_->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
 }
 
 void PanelHost::DestroyWebContents() {
+  web_contents_.reset();
   favicon_tab_helper_.reset();
-  prefs_tab_helper_.reset();
-  web_contents_.reset();
 }
 
 SkBitmap PanelHost::GetPageIcon() const {
   // TODO: Make this function return gfx::Image.
   return favicon_tab_helper_.get() ?
       favicon_tab_helper_->GetFavicon().AsBitmap() : SkBitmap();
 }
 
 void PanelHost::NavigationStateChanged(const content::WebContents* source,
                                        unsigned changed_flags) {
@@ skipping 111 matching lines @@
 }
 
 void PanelHost::StopLoading() {
   content::RecordAction(UserMetricsAction("Stop"));
   web_contents_->Stop();
 }
 
 void PanelHost::Zoom(content::PageZoom zoom) {
   chrome_page_zoom::Zoom(web_contents_.get(), zoom);
 }