Make html_contents_ in BallonViewImpl scoped_ptr.

Initially, this object was owned by views hierarchy, but this is not the case since
http://src.chromium.org/viewvc/chrome?view=rev&revision=42404.

The leak didn't manifest itself until http://src.chromium.org/viewvc/chrome?view=rev&revision=110041

TEST=none
BUG=104029


Review URL: http://codereview.chromium.org/8585011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110460 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/notifications/balloon_view.cc

@@ -214,7 +214,7 @@ BalloonViewImpl::~BalloonViewImpl() {
   if (control_view_host_.get()) {
     control_view_host_->CloseNow();
   }
-  if (html_contents_) {
+  if (html_contents_.get()) {
     html_contents_->Shutdown();
   }
 }
@@ -224,7 +224,7 @@ BalloonViewImpl::~BalloonViewImpl() {
 
 void BalloonViewImpl::Show(Balloon* balloon) {
   balloon_ = balloon;
-  html_contents_ = new BalloonViewHost(balloon);
+  html_contents_.reset(new BalloonViewHost(balloon));
   if (web_ui_)
     html_contents_->EnableWebUI();
   AddChildView(html_contents_->view());
@@ -255,7 +255,7 @@ gfx::Size BalloonViewImpl::GetSize() const {
 }
 
 BalloonHost* BalloonViewImpl::GetHost() const {
-  return html_contents_;
+  return html_contents_.get();
 }
 
 void BalloonViewImpl::RepositionToBalloon() {
@@ -352,7 +352,7 @@ void BalloonViewImpl::Deactivated() {
 
 void BalloonViewImpl::DelayedClose(bool by_user) {
   html_contents_->Shutdown();
-  html_contents_ = NULL;
+  html_contents_.reset();
   balloon_->OnClose(by_user);
 }
 

chrome/browser/chromeos/notifications/balloon_view.h

@@ -99,8 +99,8 @@ class BalloonViewImpl : public BalloonView,
   // Non-owned pointer to the balloon which owns this object.
   Balloon* balloon_;
 
-  // The renderer of the HTML contents. Pointer owned by the views hierarchy.
-  BalloonViewHost* html_contents_;
+  // The renderer of the HTML contents.
+  scoped_ptr<BalloonViewHost> html_contents_;
 
   // A widget for ControlView.
   scoped_ptr<views::Widget> control_view_host_;