[ios] Fixed WebTestWithWebState::LoadHtml flakyness.

ios/web/public/test/web_test_with_web_state.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/public/test/web_test_with_web_state.h"
 
 #import <WebKit/WebKit.h>
 
 #include "base/base64.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/ios/wait_util.h"
 #import "ios/testing/ocmock_complex_type_helper.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/public/web_state/url_verification_constants.h"
+#include "ios/web/public/web_state/web_state_observer.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/web_state_impl.h"
 
 // Helper Mock to stub out API with C++ objects in arguments.
 @interface WebDelegateMock : OCMockComplexTypeHelper
 @end
 
 @implementation WebDelegateMock
 // Stub implementation always returns YES.
 - (BOOL)webController:(CRWWebController*)webController
@@ skipping 42 matching lines @@
     const base::PendingTask& pending_task) {
   // Nothing to do.
 }
 
 void WebTestWithWebState::DidProcessTask(
     const base::PendingTask& pending_task) {
   processed_a_task_ = true;
 }
 
 void WebTestWithWebState::LoadHtml(NSString* html, const GURL& url) {
-  ASSERT_FALSE(web_state()->IsLoading());
+  // Sets MIME type to "text/html" once navigation is committed.
+  class MimeTypeUpdater : public WebStateObserver {
+   public:
+    explicit MimeTypeUpdater(WebState* web_state)
+        : WebStateObserver(web_state) {}
+    // WebStateObserver overrides:
+    void NavigationItemCommitted(const LoadCommittedDetails&) override {
+      // loadHTML:forURL: does not notify web view delegate about received
+      // response, so web controller does not get a chance to properly update
+      // MIME type and it should be set manually after navigation is committed
+      // but before WebState signal load completion and clients will start
+      // checking if MIME type is in fact HTML.
+      static_cast<WebStateImpl*>(web_state())->SetContentsMimeType("text/html");
+    }
+  };
+  MimeTypeUpdater mime_type_updater(web_state());
 
+  // Initiate asynchronous HTML load.
   CRWWebController* web_controller = GetWebController(web_state());
+  ASSERT_EQ(PAGE_LOADED, web_controller.loadPhase);
   [web_controller loadHTML:html forURL:url];
-
-  // Wait until the navigation is committed to update MIME type.
   ASSERT_EQ(LOAD_REQUESTED, web_controller.loadPhase);
-  base::TimeDelta spin_delay = base::TimeDelta::FromMilliseconds(1);
-  while (web_controller.loadPhase != PAGE_LOADING) {
-    ASSERT_NE(PAGE_LOADED, web_controller.loadPhase);
-    base::test::ios::SpinRunLoopWithMaxDelay(spin_delay);
-  }
-
-  // loadHTML:forURL: does not notify web view delegate about received response,
-  // so web controller does not get a chance to properly update MIME type and it
-  // should be set manually after navigation is committed but before WebState
-  // signal load completion and clients will start checking if MIME type is in
-  // fact HTML.
-  [web_controller webStateImpl]->SetContentsMimeType("text/html");
 
   // Wait until the page is loaded.
-  ASSERT_EQ(PAGE_LOADING, web_controller.loadPhase);
-  while (web_controller.loadPhase != PAGE_LOADED)
-    base::test::ios::SpinRunLoopWithMaxDelay(spin_delay);
+  base::test::ios::WaitUntilCondition(^{
+    return web_controller.loadPhase == PAGE_LOADED;
+  });
 
   // Wait until scripts execution becomes possible.
   base::test::ios::WaitUntilCondition(^bool {
     return [ExecuteJavaScript(@"0;") isEqual:@0];
   });
 }
 
 void WebTestWithWebState::LoadHtml(NSString* html) {
   GURL url("https://chromium.test/");
   LoadHtml(html, url);
@@ skipping 62 matching lines @@
 const web::WebState* WebTestWithWebState::web_state() const {
   return web_state_.get();
 }
 
 NSString* WebTestWithWebState::CreateLoadCheck() {
   return [NSString stringWithFormat:@"<p style=\"display: none;\">%d</p>",
                                     s_html_load_count++];
 }
 
 }  // namespace web