[ios] Removed WEB_TEST_F from web unit tests.

ios/web/web_state/ui/crw_web_controller_observer_unittest.mm

Index: ios/web/web_state/ui/crw_web_controller_observer_unittest.mm
diff --git a/ios/web/web_state/ui/crw_web_controller_observer_unittest.mm b/ios/web/web_state/ui/crw_web_controller_observer_unittest.mm
index 0e16e159b039759032d44aca13eecd0c9ce4f051..6f077f3584cd1b42f0af9de72cfcdd4d5b01728c 100644
--- a/ios/web/web_state/ui/crw_web_controller_observer_unittest.mm
+++ b/ios/web/web_state/ui/crw_web_controller_observer_unittest.mm
@@ -4,13 +4,10 @@
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
-#include <vector>
-
 #include "base/json/json_writer.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/values.h"
 #import "ios/testing/ocmock_complex_type_helper.h"
-#include "ios/web/public/test/web_test_util.h"
 #import "ios/web/public/web_state/crw_web_controller_observer.h"
 #import "ios/web/public/web_state/js/crw_js_injection_manager.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
@@ -18,71 +15,56 @@
 #import "ios/web/test/web_test.h"
 #include "testing/gtest_mac.h"
 
-namespace {
+namespace web {
 
-// A mixin class for testing with CRWWKWebViewWebController or
-// CRWUIWebViewWebController.
-template <typename WebTestT>
-class CRWWebControllerObserverTest : public WebTestT {
+// Test fixture to test web controller observing.
+class CRWWebControllerObserverTest
+    : public web::WebTestWithWKWebViewWebController {
  protected:
-  virtual void SetUp() {
-    WebTestT::SetUp();
+  void SetUp() override {
+    web::WebTestWithWKWebViewWebController::SetUp();
     fake_web_controller_observer_.reset(
         [[CRWFakeWebControllerObserver alloc] initWithCommandPrefix:@"test"]);
-    [WebTestT::webController_ addObserver:fake_web_controller_observer_];
+    [webController_ addObserver:fake_web_controller_observer_];
   }
 
-  virtual void TearDown() {
-    [WebTestT::webController_ removeObserver:fake_web_controller_observer_];
+  void TearDown() override {
+    [webController_ removeObserver:fake_web_controller_observer_];
     fake_web_controller_observer_.reset();
-    WebTestT::TearDown();
+    web::WebTestWithWKWebViewWebController::TearDown();
   }
 
   base::scoped_nsobject<CRWFakeWebControllerObserver>
       fake_web_controller_observer_;
 };
 
-// Concrete test fixture to test UIWebView-based web controller observing.
-typedef CRWWebControllerObserverTest<web::WebTestWithUIWebViewWebController>
-    CRWUIWebViewWebControllerObserverTest;
-
-// Concrete test fixture to test WKWebView-based web controller observing.
-typedef CRWWebControllerObserverTest<web::WebTestWithWKWebViewWebController>
-    CRWWKWebViewWebControllerObserverTest;
-
-WEB_TEST_F(CRWUIWebViewWebControllerObserverTest,
-           CRWWKWebViewWebControllerObserverTest,
-           PageLoaded) {
-  EXPECT_FALSE([this->fake_web_controller_observer_ pageLoaded]);
-  this->LoadHtml(@"<p></p>");
-  EXPECT_TRUE([this->fake_web_controller_observer_ pageLoaded]);
+TEST_F(CRWWebControllerObserverTest, PageLoaded) {
+  EXPECT_FALSE([fake_web_controller_observer_ pageLoaded]);
+  LoadHtml(@"<p></p>");
+  EXPECT_TRUE([fake_web_controller_observer_ pageLoaded]);
 }
 
 // Tests that web controller receives a JS message from the page.
-WEB_TEST_F(CRWUIWebViewWebControllerObserverTest,
-           CRWWKWebViewWebControllerObserverTest,
-           HandleCommand) {
-  this->LoadHtml(@"<p></p>");
-  ASSERT_EQ(0U, [this->fake_web_controller_observer_ commandsReceived].size());
+TEST_F(CRWWebControllerObserverTest, HandleCommand) {
+  LoadHtml(@"<p></p>");
+  ASSERT_EQ(0U, [fake_web_controller_observer_ commandsReceived].size());
   base::DictionaryValue command;
   command.SetString("command", "test.testMessage");
   std::string message;
   base::JSONWriter::Write(command, &message);
-  this->RunJavaScript([NSString
+  RunJavaScript([NSString
       stringWithFormat:@"__gCrWeb.message.invokeOnHost(%s)", message.c_str()]);
-  this->WaitForBackgroundTasks();
-  ASSERT_EQ(1U, [this->fake_web_controller_observer_ commandsReceived].size());
-  EXPECT_TRUE([this->fake_web_controller_observer_ commandsReceived][0]->Equals(
-      &command));
+  WaitForBackgroundTasks();
+  ASSERT_EQ(1U, [fake_web_controller_observer_ commandsReceived].size());
+  EXPECT_TRUE(
+      [fake_web_controller_observer_ commandsReceived][0]->Equals(&command));
 }
 
 // Tests that web controller receives an immediate JS message from the page.
-WEB_TEST_F(CRWUIWebViewWebControllerObserverTest,
-           CRWWKWebViewWebControllerObserverTest,
-           HandleImmediateCommand) {
-  this->LoadHtml(@"<p></p>");
+TEST_F(CRWWebControllerObserverTest, HandleImmediateCommand) {
+  LoadHtml(@"<p></p>");
   ASSERT_NSNE(@"http://testimmediate#target",
-              [this->webController_ externalRequestWindowName]);
+              [webController_ externalRequestWindowName]);
   // The only valid immediate commands are window.unload and externalRequest.
   base::DictionaryValue command;
   command.SetString("command", "externalRequest");
@@ -91,19 +73,17 @@ WEB_TEST_F(CRWUIWebViewWebControllerObserverTest,
   command.SetString("referrerPolicy", "referrerPolicy");
   std::string message;
   base::JSONWriter::Write(command, &message);
-  this->RunJavaScript(
+  RunJavaScript(
       [NSString stringWithFormat:@"__gCrWeb.message.invokeOnHostImmediate(%s)",
                                  message.c_str()]);
-  this->WaitForBackgroundTasks();
+  WaitForBackgroundTasks();
   ASSERT_NSEQ(@"http://testimmediate#target",
-              [this->webController_ externalRequestWindowName]);
+              [webController_ externalRequestWindowName]);
 }
 
 // Send a large number of commands and check each one is immediately received.
-WEB_TEST_F(CRWUIWebViewWebControllerObserverTest,
-           CRWWKWebViewWebControllerObserverTest,
-           HandleMultipleCommands) {
-  this->LoadHtml(@"<p></p>");
+TEST_F(CRWWebControllerObserverTest, HandleMultipleCommands) {
+  LoadHtml(@"<p></p>");
 
   base::DictionaryValue command;
   command.SetString("command", "test.testMessage");
@@ -112,21 +92,17 @@ WEB_TEST_F(CRWUIWebViewWebControllerObserverTest,
     std::string message;
     command.SetInteger("number", count);
     base::JSONWriter::Write(command, &message);
-    ASSERT_EQ(0U,
-              [this->fake_web_controller_observer_ commandsReceived].size());
-    this->RunJavaScript(
+    ASSERT_EQ(0U, [fake_web_controller_observer_ commandsReceived].size());
+    RunJavaScript(
         [NSString stringWithFormat:@"__gCrWeb.message.invokeOnHost(%s)",
                                    message.c_str()]);
-    this->WaitForBackgroundTasks();
-    ASSERT_EQ(1U,
-              [this->fake_web_controller_observer_ commandsReceived].size());
+    WaitForBackgroundTasks();
+    ASSERT_EQ(1U, [fake_web_controller_observer_ commandsReceived].size());
     EXPECT_TRUE(
-        [this->fake_web_controller_observer_ commandsReceived][0]->Equals(
-            &command));
-    [this->fake_web_controller_observer_ commandsReceived].clear();
-    ASSERT_EQ(0U,
-              [this->fake_web_controller_observer_ commandsReceived].size());
+        [fake_web_controller_observer_ commandsReceived][0]->Equals(&command));
+    [fake_web_controller_observer_ commandsReceived].clear();
+    ASSERT_EQ(0U, [fake_web_controller_observer_ commandsReceived].size());
   }
 }
 
-}  // namespace
+}  // namespace web