Fix WebViewInteractiveTest.NewWindow

content/browser/browser_plugin/browser_plugin_guest.cc

Index: content/browser/browser_plugin/browser_plugin_guest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 254be6f4c3d143e9e26ebaff1a5aa8c37d7cb0f7..4f9341827d9f21bd5805ebc50662ca06121a7bf6 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -665,7 +665,7 @@ base::SharedMemory* BrowserPluginGuest::GetDamageBufferFromEmbedder(
       new base::SharedMemory(params.damage_buffer_handle, false));
 #endif
   if (!shared_buf->Map(params.damage_buffer_size)) {
-    NOTREACHED();
+    LOG(WARNING) << "Unable to map the embedder's damage buffer.";
     return NULL;
   }
   return shared_buf.release();
@@ -676,7 +676,8 @@ void BrowserPluginGuest::SetDamageBuffer(
   damage_buffer_.reset(GetDamageBufferFromEmbedder(params));
   // Sanity check: Verify that we've correctly shared the damage buffer memory
   // between the embedder and browser processes.
-  DCHECK(*static_cast<unsigned int*>(damage_buffer_->memory()) == 0xdeadbeef);
+  DCHECK(!damage_buffer_ ||
+      *static_cast<unsigned int*>(damage_buffer_->memory()) == 0xdeadbeef);
   damage_buffer_sequence_id_ = params.damage_buffer_sequence_id;
   damage_buffer_size_ = params.damage_buffer_size;
   damage_view_size_ = params.view_rect.size();