Renaming unit_test class MockValidationTestClient to not collide.

Both DocumentTest and HTMLFormControlTest uses a local MockValidationTestClient class for testing. That is normally no big deal but in jumbo builds they can be compiled in the same translation unit and then they will collide. This patch gives the classes unique prefixes. R=fs@opera.com Change-Id: If1f2d22fca4c5f7b3ad662f6ae746cef4baf48c3 Reviewed-on: https://chromium-review.googlesource.com/574174 Commit-Queue: Daniel Bratell <bratell@opera.com> Reviewed-by: Fredrik Söderquist <fs@opera.com> Cr-Commit-Position: refs/heads/master@{#487091}

Renaming unit_test class MockValidationTestClient to not collide.
Both DocumentTest and HTMLFormControlTest uses a local MockValidationTestClient class for testing. That is normally no big deal but in jumbo builds they can be compiled in the same translation unit and then they will collide. This patch gives the classes unique prefixes. R=fs@opera.com Change-Id: If1f2d22fca4c5f7b3ad662f6ae746cef4baf48c3 Reviewed-on: https://chromium-review.googlesource.com/574174 Commit-Queue: Daniel Bratell <bratell@opera.com> Reviewed-by: Fredrik Söderquist <fs@opera.com> Cr-Commit-Position: refs/heads/master@{#487091}
e1a0c579 · Daniel Bratell · Commit Bot · 65e5bafa · e1a0c579 · e1a0c579
Commit e1a0c579 authored Jul 17, 2017 by Daniel Bratell Committed by Commit Bot Jul 17, 2017
2 changed files
--- a/third_party/WebKit/Source/core/dom/DocumentTest.cpp
+++ b/third_party/WebKit/Source/core/dom/DocumentTest.cpp
@@ -285,13 +285,13 @@ DEFINE_TRACE(TestDocumentShutdownObserver) {
  DocumentShutdownObserver::Trace(visitor);
 }

-class MockValidationMessageClient
-    : public GarbageCollectedFinalized<MockValidationMessageClient>,
+class MockDocumentValidationMessageClient
+    : public GarbageCollectedFinalized<MockDocumentValidationMessageClient>,
      public ValidationMessageClient {
-  USING_GARBAGE_COLLECTED_MIXIN(MockValidationMessageClient);
+  USING_GARBAGE_COLLECTED_MIXIN(MockDocumentValidationMessageClient);

 public:
-  MockValidationMessageClient() { Reset(); }
+  MockDocumentValidationMessageClient() { Reset(); }
  void Reset() {
    show_validation_message_was_called = false;
    document_detached_was_called = false;
@@ -798,7 +798,8 @@ TEST_F(DocumentTest, ThemeColor) {
 TEST_F(DocumentTest, ValidationMessageCleanup) {
  ValidationMessageClient* original_client =
      &GetPage().GetValidationMessageClient();
-  MockValidationMessageClient* mock_client = new MockValidationMessageClient();
+  MockDocumentValidationMessageClient* mock_client =
+      new MockDocumentValidationMessageClient();
  GetDocument().GetSettings()->SetScriptEnabled(true);
  GetPage().SetValidationMessageClient(mock_client);
  // ImplicitOpen()-CancelParsing() makes Document.loadEventFinished()

--- a/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp
@@ -18,10 +18,10 @@
 namespace blink {

 namespace {
-class MockValidationMessageClient
-    : public GarbageCollectedFinalized<MockValidationMessageClient>,
+class MockFormValidationMessageClient
+    : public GarbageCollectedFinalized<MockFormValidationMessageClient>,
      public ValidationMessageClient {
-  USING_GARBAGE_COLLECTED_MIXIN(MockValidationMessageClient);
+  USING_GARBAGE_COLLECTED_MIXIN(MockFormValidationMessageClient);

 public:
  void ShowValidationMessage(const Element& anchor,
@@ -127,7 +127,7 @@ TEST_F(HTMLFormControlElementTest, UpdateValidationMessageSkippedIfPrinting) {
      "<body><input required id=input></body>");
  GetDocument().View()->UpdateAllLifecyclePhases();
  ValidationMessageClient* validation_message_client =
-      new MockValidationMessageClient();
+      new MockFormValidationMessageClient();
  GetPage().SetValidationMessageClient(validation_message_client);
  Page::OrdinaryPages().insert(&GetPage());