Merged r20233 into trunk branch.

test/mjsunit/es6/weak_collections.js

Index: test/mjsunit/es6/weak_collections.js
diff --git a/test/mjsunit/es6/weak_collections.js b/test/mjsunit/es6/weak_collections.js
index 74235e7d2c7a9c4210c5a1b61f167afb7982fdfd..af23903ebc4cd2c272dce4d201f16b9a2af8773a 100644
--- a/test/mjsunit/es6/weak_collections.js
+++ b/test/mjsunit/es6/weak_collections.js
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Flags: --expose-gc --allow-natives-syntax
+// Flags: --harmony-weak-collections --expose-gc --allow-natives-syntax
 
 
 // Note: this test is superseded by harmony/collections.js.
@@ -225,7 +225,7 @@ function TestPrototype(C) {
   assertTrue(C.prototype instanceof Object);
   assertEquals({
     value: {},
-    writable: false,
+    writable: true,  // TODO(2793): This should be non-writable.
     enumerable: false,
     configurable: false
   }, Object.getOwnPropertyDescriptor(C, "prototype"));