Merge Chromium at r63472 : Initial merge by git.

Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a

1 files changed, 12 insertions, 2 deletions

diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc
index bf32612..84e8c2d 100644
--- a/chrome/browser/content_exceptions_table_model.cc
+++ b/chrome/browser/content_exceptions_table_model.cc
@@ -27,8 +27,10 @@ ContentExceptionsTableModel::ContentExceptionsTableModel(
   }
 }
 
+ContentExceptionsTableModel::~ContentExceptionsTableModel() {}
+
 void ContentExceptionsTableModel::AddException(
-    const HostContentSettingsMap::Pattern& pattern,
+    const HostContentSettingsMap::Pattern& original_pattern,
     ContentSetting setting,
     bool is_off_the_record) {
   DCHECK(!is_off_the_record || off_the_record_map_);
@@ -36,6 +38,9 @@ void ContentExceptionsTableModel::AddException(
   int insert_position =
       is_off_the_record ? RowCount() : static_cast<int>(entries_.size());
 
+  const HostContentSettingsMap::Pattern pattern(
+      original_pattern.CanonicalizePattern());
+
   entries(is_off_the_record).push_back(
       HostContentSettingsMap::PatternSettingPair(pattern, setting));
   map(is_off_the_record)->SetContentSetting(pattern,
@@ -72,13 +77,16 @@ void ContentExceptionsTableModel::RemoveAll() {
 }
 
 int ContentExceptionsTableModel::IndexOfExceptionByPattern(
-    const HostContentSettingsMap::Pattern& pattern,
+    const HostContentSettingsMap::Pattern& original_pattern,
     bool is_off_the_record) {
   DCHECK(!is_off_the_record || off_the_record_map_);
 
   int offset =
       is_off_the_record ? static_cast<int>(entries_.size()) : 0;
 
+  const HostContentSettingsMap::Pattern pattern(
+      original_pattern.CanonicalizePattern());
+
   // This is called on every key type in the editor. Move to a map if we end up
   // with lots of exceptions.
   for (size_t i = 0; i < entries(is_off_the_record).size(); ++i) {
@@ -105,6 +113,8 @@ std::wstring ContentExceptionsTableModel::GetText(int row, int column_id) {
           return l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON);
         case CONTENT_SETTING_BLOCK:
           return l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON);
+        case CONTENT_SETTING_ASK:
+          return l10n_util::GetString(IDS_EXCEPTIONS_ASK_BUTTON);
         case CONTENT_SETTING_SESSION_ONLY:
           return l10n_util::GetString(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
         default: