Site Settings Desktop: Fix issues with entering URL patterns.

chrome/browser/resources/settings/site_settings/site_settings_behavior.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview Behavior common to Site Settings classes.
  */
 
 /** @polymerBehavior */
 var SiteSettingsBehaviorImpl = {
@@ skipping 372 matching lines @@
       return url.slice(0, -4);
     }
     if (urlWithScheme.startsWith('http://') &&
         urlWithScheme.endsWith(':80')) {
       return url.slice(0, -3);
     }
     return url;
   },
 
   /**
-   * Adds the wildcard prefix to a pattern string.
+   * Adds the wildcard prefix to a pattern string (if missing).
    * @param {string} pattern The pattern to add the wildcard to.
    * @return {string} The resulting pattern.
    * @private
    */
   addPatternWildcard: function(pattern) {
+    if (pattern.indexOf('[*.]') > -1)
+      return pattern;

[Finnur, 2016/09/05 11:23:17]

When the user manually enters a URL pattern with a wildcard, we don't want to
add an extra one.

[dschuyler, 2016/09/06 18:20:29]

Acknowledged.

     if (pattern.startsWith('http://'))
       return pattern.replace('http://', 'http://[*.]');
     else if (pattern.startsWith('https://'))
       return pattern.replace('https://', 'https://[*.]');
     else
       return '[*.]' + pattern;
   },
 
   /**
    * Removes the wildcard prefix from a pattern string.
@@ skipping 48 matching lines @@
   computeIsSettingEnabled: function(category, setting) {
     // FullScreen is Allow vs. Ask.
     return category == settings.ContentSettingsTypes.FULLSCREEN ?
         setting != settings.PermissionValues.ASK :
         setting != settings.PermissionValues.BLOCK;
   },
 };
 
 /** @polymerBehavior */
 var SiteSettingsBehavior = [SiteSettingsBehaviorImpl];