Improve warnings for non-standard meta tag separators

third_party/WebKit/Source/web/tests/ViewportTest.cpp

 /*
  * Copyright (C) 2013 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 2934 matching lines @@
     ConsoleMessageWebFrameClient webFrameClient;
 
     registerMockedHttpURLLoad("viewport/viewport-warnings-5.html");
 
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-5.html", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
 
     Page* page = webViewHelper.webView()->page();
     PageScaleConstraints constraints = runViewportTest(page, 320, 352);
 
-    EXPECT_EQ(5U, webFrameClient.messages.size());
+    EXPECT_EQ(1U, webFrameClient.messages.size());
 
     EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[0].level);
-    EXPECT_STREQ("The value \"device-width;\" for key \"width\" is invalid, and has been ignored.",
+    EXPECT_STREQ("Error parsing a meta element's content: ';' is not a valid key-value pair separator. Please use ',' instead.",
         webFrameClient.messages[0].text.utf8().c_str());
 
-    EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[1].level);
-    EXPECT_STREQ("The value \"1.0;\" for key \"initial-scale\" was truncated to its numeric prefix.",
-        webFrameClient.messages[1].text.utf8().c_str());
-
-    EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[2].level);
-    EXPECT_STREQ("The value \"1.0;\" for key \"maximum-scale\" was truncated to its numeric prefix.",
-        webFrameClient.messages[2].text.utf8().c_str());
-
-    EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[3].level);
-    EXPECT_STREQ("The value \"0;\" for key \"user-scalable\" was truncated to its numeric prefix.",
-        webFrameClient.messages[3].text.utf8().c_str());
-
-    EXPECT_EQ(WebConsoleMessage::LevelWarning, webFrameClient.messages[4].level);
-    EXPECT_STREQ("Error parsing a meta element's content: ';' is not a valid key-value pair separator. Please use ',' instead.",
-        webFrameClient.messages[4].text.utf8().c_str());
-
     EXPECT_NEAR(320.0f, constraints.layoutSize.width(), 0.01);
     EXPECT_NEAR(352.0f, constraints.layoutSize.height(), 0.01);
     EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
     EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
     EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f);
     EXPECT_FALSE(page->viewportDescription().userZoom);
 }
 
 TEST_F(ViewportTest, viewportWarnings6)
 {
@@ skipping 29 matching lines @@
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-7.html", true, &webFrameClient, nullptr, nullptr, setViewportSettings);
 
     Page* page = webViewHelper.webView()->page();
     runViewportTest(page, 320, 352);
 
     EXPECT_EQ(0U, webFrameClient.messages.size());
 }
 
 } // namespace blink