Re-enable JSWindowIDManagerTest.WindowID

ios/web/web_state/js/crw_js_window_id_manager_unittest.mm

 // Copyright 2014 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/web_state/js/crw_js_window_id_manager.h"
 
 #include "base/mac/scoped_nsobject.h"
 #import "ios/web/public/test/crw_test_js_injection_receiver.h"
 #include "ios/web/public/web_client.h"
 #import "testing/gtest_mac.h"
@@ skipping 15 matching lines @@
   }
   // Required for CRWJSWindowIdManager creation.
   base::scoped_nsobject<CRWTestJSInjectionReceiver> receiver_;
   // Testable CRWJSWindowIdManager.
   base::scoped_nsobject<CRWJSWindowIdManager> manager_;
   // WebClient required for getting early page script, which must be injected
   // before CRWJSWindowIdManager.
   web::WebClient web_client_;
 };
 
-// TODO(jyquinn): enable this test (crbug.com/465898).
-TEST_F(JSWindowIDManagerTest, DISABLED_WindowID) {
+// Tests that reinjection of window ID JS results in a different window ID.
+// TODO(ios): This test only works for the current implementation using
+// UIWebView. CRWTestJSInjectionReceiver should be re-written to eliminate
+// web view specificity (crbug.com/486840).
+TEST_F(JSWindowIDManagerTest, WindowIDReinjection) {
   EXPECT_TRUE(manager_.get());
   [manager_ inject];
   NSString* windowID = [manager_ windowId];
   EXPECT_EQ(32U, [windowID length]);
-  // Inject a second time to check that the ID is different.
-  [manager_ inject];
-  NSString* windowID2 = [manager_ windowId];
-  EXPECT_FALSE([windowID isEqualToString:windowID2]);
+  // Reset the __gCrWeb object to enable reinjection.
+  [receiver_ evaluateJavaScript:@"__gCrWeb = undefined;"

[Eugene But (OOO till 7-30), 2015/05/12 17:14:32]

Please don't use async API in tests. If evaluation is interrupted for some
reason "EXPECT_FALSE([windowID isEqualToString:windowID2]);" will never be
called.

Use web::EvaluateJavaScriptAsString(CRWJSInjectionReceiver*, NSString*) instead.

[Jackie Quinn, 2015/05/12 17:50:01]

Done.

+            stringResultHandler:^(NSString* result, NSError* error) {
+              // Inject a second time to check that the ID is different.
+              [manager_ inject];
+              NSString* windowID2 = [manager_ windowId];
+              EXPECT_FALSE([windowID isEqualToString:windowID2]);
+            }];
 }
 
-TEST_F(JSWindowIDManagerTest, WindowIDDifferent) {
+// Tests that window ID injection by a second manager results in a different
+// window ID.
+TEST_F(JSWindowIDManagerTest, WindowIDDifferentManager) {
   [manager_ inject];
   NSString* windowID = [manager_ windowId];
   base::scoped_nsobject<CRWTestJSInjectionReceiver> receiver2(
       [[CRWTestJSInjectionReceiver alloc] init]);
   base::scoped_nsobject<CRWJSWindowIdManager> manager2(
       [[CRWJSWindowIdManager alloc] initWithReceiver:receiver2]);
   [manager2 inject];
   NSString* windowID2 = [manager2 windowId];
   EXPECT_NSNE(windowID, windowID2);
 }
 
 }  // namespace