From 88272a951a6e33df21a9dfc4759b2e318105fc8d Mon Sep 17 00:00:00 2001
From: Martin Staffa <mjstaffa@gmail.com>
Date: Thu, 2 Jun 2016 14:38:16 +0200
Subject: [PATCH] fix(select): remove workaround for Chrome bug

In the Chrome issue (https://bugs.chromium.org/p/chromium/issues/detail?id=381459)
I noticed that the bug can't be reproduced in Chrome 45 and the issue was
closed subsequently. I've also tested again with Chrome 51 and it still works.

Related: #6828
---
 src/ng/directive/select.js         | 10 ----------
 test/ng/directive/ngOptionsSpec.js | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js
index d5560debdc21..6c71ebcaf276 100644
--- a/src/ng/directive/select.js
+++ b/src/ng/directive/select.js
@@ -2,15 +2,6 @@
 
 var noopNgModelController = { $setViewValue: noop, $render: noop };
 
-function chromeHack(optionElement) {
-  // Workaround for https://code.google.com/p/chromium/issues/detail?id=381459
-  // Adding an <option selected="selected"> element to a <select required="required"> should
-  // automatically select the new element
-  if (optionElement[0].hasAttribute('selected')) {
-    optionElement[0].selected = true;
-  }
-}
-
 /**
  * @ngdoc type
  * @name  select.SelectController
@@ -90,7 +81,6 @@ var SelectController =
     var count = optionsMap.get(value) || 0;
     optionsMap.put(value, count + 1);
     self.ngModelCtrl.$render();
-    chromeHack(element);
   };
 
   // Tell the select control that an option, with the given value, has been removed
diff --git a/test/ng/directive/ngOptionsSpec.js b/test/ng/directive/ngOptionsSpec.js
index 74e4fadacba9..b830073b1450 100644
--- a/test/ng/directive/ngOptionsSpec.js
+++ b/test/ng/directive/ngOptionsSpec.js
@@ -2683,6 +2683,23 @@ describe('ngOptions', function() {
     });
   });
 
+  describe('required and empty option', function() {
+
+    it('should select the empty option after compilation', function() {
+      createSelect({
+        'name': 'select',
+        'ng-model': 'value',
+        'ng-options': 'item for item in [\'first\', \'second\', \'third\']',
+        'required': 'required'
+      }, true);
+
+      expect(element.val()).toBe('');
+      var emptyOption = element.find('option').eq(0);
+      expect(emptyOption.prop('selected')).toBe(true);
+      expect(emptyOption.val()).toBe('');
+    });
+  });
+
   describe('ngModelCtrl', function() {
     it('should prefix the model value with the word "the" using $parsers', function() {
       createSelect({