Merge 90075 - Properly initialize delegate variable.

chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc

 // Copyright (c) 2011 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/blocked_content/blocked_content_tab_helper.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_container.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 
 BlockedContentTabHelper::BlockedContentTabHelper(
     TabContentsWrapper* tab_contents)
         : TabContentsObserver(tab_contents->tab_contents()),
           blocked_contents_(new BlockedContentContainer(tab_contents)),
           all_contents_blocked_(false),
-          tab_contents_wrapper_(tab_contents) {
+          tab_contents_wrapper_(tab_contents),
+          delegate_(NULL) {
 }
 
 BlockedContentTabHelper::~BlockedContentTabHelper() {
 }
 
 void BlockedContentTabHelper::DidNavigateMainFramePostCommit(
     const content::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   // Clear all page actions, blocked content notifications and browser actions
   // for this tab, unless this is an in-page navigation.
@@ skipping 76 matching lines @@
 }
 
 size_t BlockedContentTabHelper::GetBlockedContentsCount() const {
   return blocked_contents_->GetBlockedContentsCount();
 }
 
 void BlockedContentTabHelper::GetBlockedContents(
     std::vector<TabContentsWrapper*>* blocked_contents) const {
   blocked_contents_->GetBlockedContents(blocked_contents);
 }