Reland attempt 2: Improve <webview> autosize:

chrome/test/data/extensions/platform_apps/web_view/shim/main.js

Index: chrome/test/data/extensions/platform_apps/web_view/shim/main.js
diff --git a/chrome/test/data/extensions/platform_apps/web_view/shim/main.js b/chrome/test/data/extensions/platform_apps/web_view/shim/main.js
index f3690fe919fe104eae8820fd40c50c611b01bcda..4156ce82f2d45a367ece77faa6ab2454fc8df81e 100644
--- a/chrome/test/data/extensions/platform_apps/web_view/shim/main.js
+++ b/chrome/test/data/extensions/platform_apps/web_view/shim/main.js
@@ -170,36 +170,30 @@ function testAutosizeWithPartialAttributes() {
 
   var step = 1;
   var sizeChangeHandler = function(e) {
+    window.console.log('sizeChangeHandler, new: ' +
+                       e.newWidth + ' X ' + e.newHeight);
     switch (step) {
       case 1:
         // Expect 300x200.
         embedder.test.assertEq(300, e.newWidth);
         embedder.test.assertEq(200, e.newHeight);
 
-        // Remove an autosize attribute and verify that it causes relayout.
-        webview.minwidth = null;
+        // Change the min size to cause a relayout.
+        webview.minwidth = 500;
         break;
       case 2:
-        // Expect 640x?
-        embedder.test.assertEq(640, e.newWidth);
+        embedder.test.assertTrue(e.newWidth >= webview.minwidth);
+        embedder.test.assertTrue(e.newWidth <= webview.maxwidth);
 
         // Tests when minwidth > maxwidth, minwidth = maxwidth.
-        webview.maxheight = null;
+        // i.e. minwidth is essentially 700.
         webview.minwidth = 800;
-        webview.minheight = 800;
         break;
       case 3:
-        // Expect 700X480
+        // Expect 700X?
         embedder.test.assertEq(700, e.newWidth);
-        embedder.test.assertEq(480, e.newHeight);
-
-        // Remove maxwidth and make sure the size returns to plugin size.
-        webview.removeAttribute('maxwidth');
-        break;
-      case 4:
-        // Expect original size, 640x480.
-        embedder.test.assertEq(640, e.newWidth);
-        embedder.test.assertEq(480, e.newHeight);
+        embedder.test.assertTrue(e.newHeight >= 200);
+        embedder.test.assertTrue(e.newHeight <= 600);
 
         embedder.test.succeed();
         break;
@@ -244,18 +238,16 @@ function testAutosizeRemoveAttributes() {
         webview.removeAttribute('maxwidth');
         webview.removeAttribute('minheight');
         webview.removeAttribute('maxheight');
+        webview.removeAttribute('autosize');
+
+        // We'd get one more sizechanged event after we turn off
+        // autosize.
+        webview.style.width = '500px';
+        webview.style.height = '500px';
         break;
       case 2:
-        // Expect plugin to return to its original size.
-        embedder.test.assertEq(640, e.newWidth);
-        embedder.test.assertEq(480, e.newHeight);
-
         embedder.test.succeed();
         break;
-      default:
-        window.console.log('Unexpected sizechanged event, step = ' + step);
-        embedder.test.fail();
-        break;
     }
 
     ++step;