Reland: Improve ios/web/public/test/web_js_test.h

ios/web/public/test/web_js_test.h

 // Copyright 2013 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.
 
 #ifndef IOS_INTERNAL_CHROME_BROWSER_WEB_WEB_JS_TEST_H_
 #define IOS_INTERNAL_CHROME_BROWSER_WEB_WEB_JS_TEST_H_
 
 #import <Foundation/Foundation.h>
 
 #import "base/mac/bundle_locations.h"
 #import "base/mac/scoped_nsobject.h"
 #include "testing/gtest_mac.h"
 
 class GURL;
 
 namespace web {
 
 // Base fixture mixin for testing JavaScripts.
 template <class WebTestT>
 class WebJsTest : public WebTestT {
  public:
   WebJsTest(NSArray* java_script_paths)
-      : java_script_paths_([java_script_paths retain]) {}
+      : java_script_paths_([java_script_paths copy]) {}
 
  protected:
   // Loads |html| and inject JavaScripts at |javaScriptPaths_|.
   void LoadHtmlAndInject(NSString* html) {
     WebTestT::LoadHtml(html);
     Inject();
   }
 
   // Returns a NSString representation of the JavaScript's evaluation results;
   // the JavaScript is passed in as a |format| and its arguments.
@@ skipping 19 matching lines @@
 
  private:
   // Injects JavaScript at |java_script_paths_|.
   void Inject();
 
   base::scoped_nsobject<NSArray> java_script_paths_;
 };
 
 template <class WebTestT>
 void WebJsTest<WebTestT>::Inject() {
-  // Wait until main web injection has occured.
-  NSString* beacon = nil;
-  do {
-    beacon = WebTestT::EvaluateJavaScriptAsString(@"typeof __gCrWeb");
-  } while (![beacon isEqualToString:@"object"]);
+  // Main web injection should have occured.
+  ASSERT_NSEQ(@"object",
+              WebTestT::EvaluateJavaScriptAsString(@"typeof __gCrWeb"));
+
   for (NSString* java_script_path in java_script_paths_.get()) {
     NSString* path =
         [base::mac::FrameworkBundle() pathForResource:java_script_path
                                                ofType:@"js"];
     WebTestT::EvaluateJavaScriptAsString([NSString
         stringWithContentsOfFile:path
                         encoding:NSUTF8StringEncoding
                            error:nil]);
   }
 }
@@ skipping 36 matching lines @@
     EXPECT_NSEQ(expected, EvaluateJavaScriptWithFormat(java_script,
                                                        get_element_java_script))
         << [NSString stringWithFormat:@"%@ on %@ should return %@", java_script,
                                       get_element_java_script, expected];
   }
 }
 
 }  // namespace web
 
 #endif  // IOS_INTERNAL_CHROME_BROWSER_WEB_WEB_JS_TEST_H_