blink: Rename variables clang can't confirm are compile-time constants

Rename them from kFooBar style to just normal variable style. This
occurs in a couple unit tests and covers all of the remaining cases of
wrong renaming results in the form of k_foo_bar.

Also fix 2 kFooStyle constants to actually be constant data.

R=pdr
BUG=580743

Review URL: https://codereview.chromium.org/1650993003

Cr-Commit-Position: refs/heads/master@{#372812}

2 files changed, 8 insertions, 8 deletions

diff --git a/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp b/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
index c30299c..e14f0d9 100644
--- a/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
@@ -132,13 +132,13 @@ protected:
         return m_resources;
     }
 
-    const SerializedResource* getResource(const char* url, const char* mimeType)
+    const SerializedResource* getResource(const char* urlString, const char* mimeType)
     {
-        const KURL kURL = KURL(m_baseUrl, url);
+        const KURL url(m_baseUrl, urlString);
         String mime(mimeType);
         for (size_t i = 0; i < m_resources.size(); ++i) {
             const SerializedResource& resource = m_resources[i];
-            if (resource.url == kURL && !resource.data->isEmpty()
+            if (resource.url == url && !resource.data->isEmpty()
                 && (mime.isNull() || equalIgnoringCase(resource.mimeType, mime)))
                 return &resource;
         }
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
index b19ddee..e91eee8 100644
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -525,9 +525,9 @@ TEST_F(WebViewTest, SetBaseBackgroundColor)
     EXPECT_EQ(kTransparent, frame->view()->baseBackgroundColor());
     frame->view()->dispose();
 
-    const Color kTransparentRed(100, 0, 0, 0);
-    frame->createView(IntSize(1024, 768), kTransparentRed, true);
-    EXPECT_EQ(kTransparentRed, frame->view()->baseBackgroundColor());
+    const Color transparentRed(100, 0, 0, 0);
+    frame->createView(IntSize(1024, 768), transparentRed, true);
+    EXPECT_EQ(transparentRed, frame->view()->baseBackgroundColor());
     frame->view()->dispose();
 }
 
@@ -2138,8 +2138,8 @@ TEST_F(WebViewTest, SmartClipData)
 
 TEST_F(WebViewTest, SmartClipDataWithPinchZoom)
 {
-    static const char* kExpectedClipText = "\nPrice 10,000,000won";
-    static const char* kExpectedClipHtml =
+    static const char kExpectedClipText[] = "\nPrice 10,000,000won";
+    static const char kExpectedClipHtml[] =
         "<div id=\"div4\" style=\"padding: 10px; margin: 10px; border: 2px "
         "solid skyblue; float: left; width: 190px; height: 30px; "
         "color: rgb(0, 0, 0); font-family: myahem; font-size: 8px; font-style: "