Fixes for re-enabling more MSVC level 4 warnings: content/ edition

content/common/child_process_host_impl.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 "content/common/child_process_host_impl.h"
 
 #include <limits>
 
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
@@ skipping 253 matching lines @@
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
   if (logger->Enabled())
     logger->OnPostDispatchMessage(msg, channel_id_);
 #endif
   return handled;
 }
 
 void ChildProcessHostImpl::OnChannelConnected(int32 peer_pid) {
   if (!peer_handle_ &&
-      !base::OpenPrivilegedProcessHandle(peer_pid, &peer_handle_) &&
-      !(peer_handle_ = delegate_->GetHandle())) {
-    NOTREACHED();
+      !base::OpenPrivilegedProcessHandle(peer_pid, &peer_handle_)) {
+    peer_handle_ = delegate_->GetHandle();
+    DCHECK(peer_handle_);
   }
   opening_channel_ = false;
   delegate_->OnChannelConnected(peer_pid);
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnChannelConnected(peer_pid);
 }
 
 void ChildProcessHostImpl::OnChannelError() {
   opening_channel_ = false;
   delegate_->OnChannelError();
@@ skipping 27 matching lines @@
     uint32 usage,
     gfx::GpuMemoryBufferHandle* handle) {
   handle->type = gfx::SHARED_MEMORY_BUFFER;
   AllocateSharedMemory(
       width * height * GpuMemoryBufferImpl::BytesPerPixel(internalformat),
       peer_handle_,
       &handle->handle);
 }
 
 }  // namespace content