Infobar system refactor.

chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.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 "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
@@ skipping 218 matching lines @@
                 url,
                 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
                 std::string()));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 url,
                 url,
                 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
                 std::string()));
 
-  // Removing an |InfoBarDelegate| from the |InfoBarService| does not delete
-  // it. Hence the |delegate| must be cleaned up after it was removed from the
-  // |infobar_service|.
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
-  scoped_ptr<InfoBarDelegate> delegate(infobar_service->infobar_at(0));
-  infobar_service->RemoveInfoBar(delegate.get());
+  infobar_service->RemoveInfoBar(infobar_service->infobar_at(0));
 }
 
 TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
   // Required to break dependency on BrowserMainLoop.
   MediaCaptureDevicesDispatcher::GetInstance()->
       DisableDeviceEnumerationForTesting();
 
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   std::string request_host = "google.com";
@@ skipping 483 matching lines @@
     ProtocolHandler handler = registry.GetHandlerFor("mailto");
     ASSERT_FALSE(handler.IsEmpty());
     EXPECT_EQ(ASCIIToUTF16("Handler"), handler.title());
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               content_settings->pending_protocol_handler_setting());
     EXPECT_FALSE(registry.IsIgnored(test_handler));
   }
 
   registry.Shutdown();
 }