Port identity_internals to mojo

chrome/browser/ui/webui/identity_internals/identity_internals_ui_browsertest.js

Index: chrome/browser/ui/webui/identity_internals/identity_internals_ui_browsertest.js
diff --git a/chrome/browser/ui/webui/identity_internals_ui_browsertest.js b/chrome/browser/ui/webui/identity_internals/identity_internals_ui_browsertest.js
similarity index 86%
rename from chrome/browser/ui/webui/identity_internals_ui_browsertest.js
rename to chrome/browser/ui/webui/identity_internals/identity_internals_ui_browsertest.js
index f71a7608c9de51272f20c3f294060769cc588de4..a584930a9eb7c9377737e24b4424ea17a25e42fb 100644
--- a/chrome/browser/ui/webui/identity_internals_ui_browsertest.js
+++ b/chrome/browser/ui/webui/identity_internals/identity_internals_ui_browsertest.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-GEN('#include "chrome/browser/ui/webui/identity_internals_ui_browsertest.h"');
+GEN('#include "chrome/browser/ui/webui/identity_internals/identity_internals_ui_browsertest.h"');
 
 /**
  * Test C++ fixture for downloads WebUI testing.
@@ -24,7 +24,7 @@ BaseIdentityInternalsWebUITest.prototype = {
   /**
    * Browse to the downloads page & call our preLoad().
    */
-  browsePreload: 'chrome://identity-internals',
+  browsePreloadAndWaitForMain: 'chrome://identity-internals',
 
   /** @override */
   typedefCppFixture: 'IdentityInternalsUIBrowserTest',
@@ -226,35 +226,3 @@ TEST_F('IdentityInternalsMultipleTokensWebUITest', 'getAllTokens', function() {
   expectEquals('scope_2_1', scopes[1]);
   expectEquals('', scopes[2]);
 });
-
-/**
- * Fixture for asynchronous testing of Identity Internals Web UI with multiple
- * tokens in Identity API token cache.
- * @extends {IdentityInternalsMultipleTokensWebUITest}
- * @constructor
- */
-function IdentityInternalsWebUITestAsync() {}
-
-IdentityInternalsWebUITestAsync.prototype = {
-  __proto__: IdentityInternalsMultipleTokensWebUITest.prototype,
-
-  /** @override */
-  isAsync: true,
-};
-
-TEST_F('IdentityInternalsWebUITestAsync', 'revokeToken', function() {
-  var tokenListBefore = this.getTokens();
-  expectEquals(2, tokenListBefore.length);
-  var tokenRevokeDone = identity_internals.tokenRevokeDone;
-  identity_internals.tokenRevokeDone = this.continueTest(

[Elliot Glaysher, 2014/07/21 21:56:03]

This test was removed because I don't believe we can hot patch this in a mojo
world.

[fgorski, 2014/07/23 19:02:09]

Is there a long term solution to a problem. I was a noogler when writing this
piece of code, so it is hard to believe (and remember) that I didn't see this
approach used someplace else. That means this you may have to delete a few more
tests at least. I don't think that's reasonable and there should be an approach
worked out for this problem.

Would you consider disabling the test instead of deleting it? Or is testing
user's actions on WebUI never meant to work?

[Elliot Glaysher, 2014/07/23 20:20:04]

There isn't a generic way to do this (and long term, one will have to exist for
testing). I've readded this test and modified it to use a bit of a hack.

-      WhenTestDone.ALWAYS, function(accessTokens) {
-        tokenRevokeDone.call(identity_internals, accessTokens);
-        identity_internals.tokenRevokeDone = tokenRevokeDone;
-        var tokenListAfter = this.getTokens();
-        expectEquals(1, tokenListAfter.length);
-        expectEquals(this.getAccessToken(tokenListBefore[0]),
-                     this.getAccessToken(tokenListAfter[0]));
-      }.bind(this));
-  this.getRevokeButton(tokenListBefore[1]).click();
-});
-