Switch web API/permission code to use IsOriginSecure() instead of SchemeIsSecure().

components/content_settings/core/browser/host_content_settings_map.cc

 // Copyright (c) 2012 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 "components/content_settings/core/browser/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/clock.h"
+#include "chrome/common/origin_util.h"
 #include "components/content_settings/core/browser/content_settings_default_provider.h"
 #include "components/content_settings/core/browser/content_settings_details.h"
 #include "components/content_settings/core/browser/content_settings_observable_provider.h"
 #include "components/content_settings/core/browser/content_settings_policy_provider.h"
 #include "components/content_settings/core/browser/content_settings_pref_provider.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/pref_names.h"
@@ skipping 621 matching lines @@
       content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
     return false;
   }
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
   if (content_type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) {
     return false;
   }
 #endif
   if (secondary_url.SchemeIs(kChromeUIScheme) &&
       content_type == CONTENT_SETTINGS_TYPE_COOKIES &&
-      primary_url.SchemeIsSecure()) {
+      IsOriginSecure(primary_url)) {
     return true;
   }
 #if defined(ENABLE_EXTENSIONS)
   if (primary_url.SchemeIs(kExtensionScheme)) {
     switch (content_type) {
       case CONTENT_SETTINGS_TYPE_PLUGINS:
       case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
       case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
       case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
         return false;
@@ skipping 96 matching lines @@
     }
   }
 
   if (info) {
     info->source = content_settings::SETTING_SOURCE_NONE;
     info->primary_pattern = ContentSettingsPattern();
     info->secondary_pattern = ContentSettingsPattern();
   }
   return scoped_ptr<base::Value>();
 }