Index: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm |
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm |
index f762d0c84eb8fae4abd6bdf7b5909bfa4a4a2286..59ba0e7c5c24564d1d44f5281ad0f51fb30896ad 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm |
+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm |
@@ -1271,33 +1271,34 @@ InputEventAck unhandled_scroll_ack(InputEventAckSource::COMPOSITOR_THREAD, |
new MockRenderWidgetHostImpl(&delegate, process_host, routing_id); |
RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(host, false); |
- EXPECT_NE(static_cast<unsigned>(SK_ColorTRANSPARENT), |
- view->background_color()); |
- EXPECT_TRUE([view->cocoa_view() isOpaque]); |
- |
- view->SetBackgroundColor(SK_ColorTRANSPARENT); |
EXPECT_EQ(static_cast<unsigned>(SK_ColorTRANSPARENT), |
view->background_color()); |
EXPECT_FALSE([view->cocoa_view() isOpaque]); |
+ view->SetBackgroundColor(SK_ColorWHITE); |
+ EXPECT_NE(static_cast<unsigned>(SK_ColorTRANSPARENT), |
+ view->background_color()); |
+ EXPECT_TRUE([view->cocoa_view() isOpaque]); |
+ |
const IPC::Message* set_background; |
set_background = process_host->sink().GetUniqueMessageMatching( |
ViewMsg_SetBackgroundOpaque::ID); |
ASSERT_TRUE(set_background); |
std::tuple<bool> sent_background; |
ViewMsg_SetBackgroundOpaque::Read(set_background, &sent_background); |
- EXPECT_FALSE(std::get<0>(sent_background)); |
+ EXPECT_TRUE(std::get<0>(sent_background)); |
// Try setting it back. |
process_host->sink().ClearMessages(); |
- view->SetBackgroundColor(SK_ColorWHITE); |
- EXPECT_EQ(static_cast<unsigned>(SK_ColorWHITE), view->background_color()); |
- EXPECT_TRUE([view->cocoa_view() isOpaque]); |
+ view->SetBackgroundColor(SK_ColorTRANSPARENT); |
+ EXPECT_EQ(static_cast<unsigned>(SK_ColorTRANSPARENT), |
+ view->background_color()); |
+ EXPECT_FALSE([view->cocoa_view() isOpaque]); |
set_background = process_host->sink().GetUniqueMessageMatching( |
ViewMsg_SetBackgroundOpaque::ID); |
ASSERT_TRUE(set_background); |
ViewMsg_SetBackgroundOpaque::Read(set_background, &sent_background); |
- EXPECT_TRUE(std::get<0>(sent_background)); |
+ EXPECT_FALSE(std::get<0>(sent_background)); |
host->ShutdownAndDestroyWidget(true); |
} |