Fix WebViewInteractiveTest.NewWindow

Allowing for NULL damage buffers in low memory situations.

Ran 200 times on bots.

BUG=222618

Review URL: https://chromiumcodereview.appspot.com/13865008

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

chrome/browser/extensions/web_view_interactive_browsertest.cc

@@ -382,8 +382,7 @@ IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, EditCommandsNoMenu) {
   ASSERT_TRUE(start_of_line_listener.WaitUntilSatisfied());
 }
 
-// Disabled due to timeouts/crashing on several platforms. crbug.com/241912
-IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, DISABLED_NewWindow) {
+IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow) {
   ASSERT_TRUE(StartTestServer());  // For serving guest pages.
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/newwindow"))
       << message_;

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();