Revert 61591 - Revert 61578 - Fix build break on Linux.

Not sure how but Linux heapcheck went red.  No other reasonable suspects.

http://build.chromium.org/buildbot/memory/builders/Linux%20Heapcheck/builds/8390/steps/heapcheck%20test:%20remoting/logs/stdio

Suppression:
{
   <insert_a_suppression_name_here>
   Heapcheck:Leak
   fun:__gnu_cxx::new_allocator::allocate
   fun:std::string::_Rep::_S_create
   fun:std::string::_S_construct
   fun:std::string::_S_construct_aux
   fun:std::string::_S_construct
   fun:basic_string
   fun:std::basic_stringbuf::str
   fun:std::basic_ostringstream::str
   fun:talk_base::SocketAddress::IPToString
   fun:talk_base::SocketAddress::IPAsString
   fun:cricket::P2PTransportParser::WriteCandidate
   fun:cricket::P2PTransportParser::WriteCandidates
   fun:cricket::WriteCandidates
   fun:cricket::WriteJingleTransportInfo
   fun:cricket::WriteJingleTransportInfos
   fun:cricket::WriteTransportInfos
   fun:cricket::Session::WriteSessionAction
   fun:cricket::Session::WriteActionMessage
   fun:cricket::Session::WriteActionMessage
   fun:cricket::Session::SendMessage
   fun:cricket::Session::SendTransportInfoMessage
   fun:cricket::Session::OnTransportCandidatesReady
   fun:sigslot::_connection2::emit
   fun:sigslot::signal2::operator
   fun:cricket::Transport::OnChannelCandidateReady_s
   fun:cricket::Transport::OnMessage
   fun:talk_base::MessageQueue::Dispatch
   fun:talk_base::Thread::ProcessMessages
   fun:talk_base::Thread::Run
   fun:remoting::JingleThread::Run
   fun:talk_base::Thread::PreRun
   fun:start_thread
}




TBR=evan
Review URL: http://codereview.chromium.org/3594011

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/3598013

TBR=dhollowa@chromium.org
Review URL: http://codereview.chromium.org/3619005

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

1 files changed, 1 insertions, 1 deletions

diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index a064c20..0e05808 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -796,7 +796,7 @@ void ResourceMessageFilter::OnGotPluginInfo(bool found,
                                             const std::string& actual_mime_type,
                                             const GURL& policy_url,
                                             IPC::Message* reply_msg) {
-  ContentSetting setting;
+  ContentSetting setting = CONTENT_SETTING_DEFAULT;
   if (found) {
     info.enabled = info.enabled &&
         plugin_service_->PrivatePluginAllowedForURL(info.path, policy_url);