Update css styles after modifying display mode

Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2088 matching lines @@
 };
 
 WebFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, WebSandboxFlags sandboxFlags)
 {
     ++m_count;
     return TestWebFrameClient::createChildFrame(parent, scope, frameName, sandboxFlags);
 }
 
 TEST_F(WebViewTest, ChangeDisplayMode)
 {
-    WebView* webView = m_webViewHelper.initializeAndLoad("about:blank", true);
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("display_mode.html"));

[kenneth.r.christiansen, 2015/08/17 09:03:36]

You forgot to add this display_mode.html file?

[a.renevier, 2015/08/17 17:25:57]

Done.

+    WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "display_mode.html", true);
 
-    WebScriptSource source("document.querySelector('body').innerHTML = window.matchMedia('(display-mode: minimal-ui)').matches");
-
-    webView->mainFrame()->executeScript(source);
-    std::string content = webView->mainFrame()->contentAsText(5).utf8();
-    EXPECT_EQ("false", content);
+    std::string content = webView->mainFrame()->contentAsText(21).utf8();

[Mike West, 2015/08/17 15:29:06]

21?

[a.renevier, 2015/08/17 17:25:57]

size of "regular-ui" + "minimal-ui" + 1

+    EXPECT_EQ("regular-ui", content);

[kenneth.r.christiansen, 2015/08/17 09:03:36]

regular-ui? That is not a valid value for display-mode - you must mean ´browser´
here

[a.renevier, 2015/08/17 17:25:57]

In my test file, I only check if display mode is minimal-ui, in which case it
displays minimal-ui. Otherwise, it display regular-ui. Do you think I should
change that label to browser?

 
     webView->setDisplayMode(WebDisplayModeMinimalUi);
-    webView->mainFrame()->executeScript(source);
-    content = webView->mainFrame()->contentAsText(5).utf8();
-    EXPECT_EQ("true", content);
+    content = webView->mainFrame()->contentAsText(21).utf8();
+    EXPECT_EQ("minimal-ui", content);
+    m_webViewHelper.reset();
 }
 
 TEST_F(WebViewTest, AddFrameInCloseUnload)
 {
     CreateChildCounterFrameClient frameClient;
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("add_frame_in_unload.html"));
     m_webViewHelper.initializeAndLoad(m_baseURL + "add_frame_in_unload.html", true, &frameClient);
     m_webViewHelper.reset();
     EXPECT_EQ(0, frameClient.count());
 }
@@ skipping 912 matching lines @@
     for (size_t i = 0; i < renders.size(); ++i) {
         double docStartTime = frame->domWindow()->document()->loader()->timing().monotonicTimeToZeroBasedDocumentTime(renderPairs[i].startTime) * 1000.0;
         ASSERT_DOUBLE_EQ(docStartTime, renders[i]->startTime());
         double docFinishTime = frame->domWindow()->document()->loader()->timing().monotonicTimeToZeroBasedDocumentTime(renderPairs[i].finishTime) * 1000.0;
         double docDuration = docFinishTime - docStartTime;
         ASSERT_DOUBLE_EQ(docDuration, renders[i]->duration());
     }
 }
 
 } // namespace blink