Remove vestigial cookie/web app permissions prompting UI now that the async U...

chrome/browser/host_content_settings_map.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/host_content_settings_map.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 786 matching lines @@
       if ((kTypeNames[type] != NULL) && (kTypeNames[type] == content_type)) {
         int setting = CONTENT_SETTING_DEFAULT;
         bool found = dictionary->GetIntegerWithoutPathExpansion(content_type,
                                                                 &setting);
         DCHECK(found);
         settings->settings[type] = IntToContentSetting(setting);
         break;
       }
     }
   }
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableCookiePrompt)) {
-    // Migrate obsolete cookie prompt mode.
-    if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] ==
-        CONTENT_SETTING_ASK)
-      settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK;
-  }
+  // Migrate obsolete cookie prompt mode.
+  if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] ==
+      CONTENT_SETTING_ASK)
+    settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK;
 }
 
 void HostContentSettingsMap::GetResourceSettingsFromDictionary(
     const DictionaryValue* dictionary,
     ResourceContentSettings* settings) {
   for (DictionaryValue::key_iterator i(dictionary->begin_keys());
        i != dictionary->end_keys(); ++i) {
     const std::string& content_type(*i);
     for (size_t type = 0; type < arraysize(kResourceTypeNames); ++type) {
       if ((kResourceTypeNames[type] != NULL) &&
@@ skipping 94 matching lines @@
     return;
   PrefService* prefs = profile_->GetPrefs();
   prefs->RemovePrefObserver(prefs::kDefaultContentSettings, this);
   prefs->RemovePrefObserver(prefs::kContentSettingsPatterns, this);
   prefs->RemovePrefObserver(prefs::kBlockThirdPartyCookies, this);
   prefs->RemovePrefObserver(prefs::kBlockNonsandboxedPlugins, this);
   notification_registrar_.Remove(this, NotificationType::PROFILE_DESTROYED,
                                  Source<Profile>(profile_));
   profile_ = NULL;
 }