Clean content_settings_pattern_parser.* from unnecessary dependencies.

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 531952ecab655c7044bc120379e1a04836c9766c..2b4d34461e0e12197537da52002b1c523129c4b8 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -44,6 +44,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/page_zoom.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
@@ -177,11 +178,12 @@ base::DictionaryValue* GetExceptionForPage(
     const ContentSetting& setting,
     const std::string& provider_name) {
   base::DictionaryValue* exception = new base::DictionaryValue();
-  exception->SetString(kOrigin, pattern.ToString());
+  exception->SetString(kOrigin, pattern.ToString(extensions::kExtensionScheme));
   exception->SetString(kEmbeddingOrigin,
                        secondary_pattern == ContentSettingsPattern::Wildcard() ?
                            std::string() :
-                           secondary_pattern.ToString());
+                           secondary_pattern.ToString(
+                               extensions::kExtensionScheme));
   exception->SetString(kSetting, ContentSettingToString(setting));
   exception->SetString(kSource, provider_name);
   return exception;
@@ -196,8 +198,9 @@ base::DictionaryValue* GetGeolocationExceptionForPage(
     ContentSetting setting) {
   base::DictionaryValue* exception = new base::DictionaryValue();
   exception->SetString(kSetting, ContentSettingToString(setting));
-  exception->SetString(kOrigin, origin.ToString());
-  exception->SetString(kEmbeddingOrigin, embedding_origin.ToString());
+  exception->SetString(kOrigin, origin.ToString(extensions::kExtensionScheme));
+  exception->SetString(kEmbeddingOrigin,
+                       embedding_origin.ToString(extensions::kExtensionScheme));
   return exception;
 }
 
@@ -210,7 +213,7 @@ base::DictionaryValue* GetNotificationExceptionForPage(
     const std::string& provider_name) {
   base::DictionaryValue* exception = new base::DictionaryValue();
   exception->SetString(kSetting, ContentSettingToString(setting));
-  exception->SetString(kOrigin, pattern.ToString());
+  exception->SetString(kOrigin, pattern.ToString(extensions::kExtensionScheme));
   exception->SetString(kSource, provider_name);
   return exception;
 }
@@ -966,7 +969,8 @@ void ContentSettingsHandler::UpdateMediaExceptionsView() {
     media_dict->GetString(kSetting, &audio_setting);
     media_dict->GetString(kVideoSetting, &video_setting);
     media_settings_.exceptions.push_back(MediaException(
-        ContentSettingsPattern::FromString(origin),
+        ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+                                           origin),
         ContentSettingFromString(audio_setting),
         ContentSettingFromString(video_setting)));
   }
@@ -1179,7 +1183,7 @@ void ContentSettingsHandler::RemoveNotificationException(
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK);
   DesktopNotificationProfileUtil::ClearSetting(profile,
-      ContentSettingsPattern::FromString(origin));
+      ContentSettingsPattern::FromString(extensions::kExtensionScheme, origin));
 }
 
 void ContentSettingsHandler::RemoveMediaException(const base::ListValue* args) {
@@ -1195,16 +1199,20 @@ void ContentSettingsHandler::RemoveMediaException(const base::ListValue* args) {
       mode == "normal" ? GetContentSettingsMap() :
                          GetOTRContentSettingsMap();
   if (settings_map) {
-    settings_map->SetWebsiteSetting(ContentSettingsPattern::FromString(pattern),
-                                    ContentSettingsPattern::Wildcard(),
-                                    CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
-                                    std::string(),
-                                    NULL);
-    settings_map->SetWebsiteSetting(ContentSettingsPattern::FromString(pattern),
-                                    ContentSettingsPattern::Wildcard(),
-                                    CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
-                                    std::string(),
-                                    NULL);
+    settings_map->SetWebsiteSetting(
+        ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+                                           pattern),
+        ContentSettingsPattern::Wildcard(),
+        CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
+        std::string(),
+        NULL);
+    settings_map->SetWebsiteSetting(
+        ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+                                           pattern),
+        ContentSettingsPattern::Wildcard(),
+        CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
+        std::string(),
+        NULL);
   }
 }
 
@@ -1231,10 +1239,12 @@ void ContentSettingsHandler::RemoveExceptionFromHostContentSettingsMap(
                          GetOTRContentSettingsMap();
   if (settings_map) {
     settings_map->SetWebsiteSetting(
-        ContentSettingsPattern::FromString(pattern),
+        ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+                                           pattern),
         secondary_pattern.empty() ?
             ContentSettingsPattern::Wildcard() :
-            ContentSettingsPattern::FromString(secondary_pattern),
+            ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+                                               secondary_pattern),
         type,
         std::string(),
         NULL);
@@ -1431,11 +1441,13 @@ void ContentSettingsHandler::SetException(const base::ListValue* args) {
     // got destroyed before we received this message.
     if (!settings_map)
       return;
-    settings_map->SetContentSetting(ContentSettingsPattern::FromString(pattern),
-                                    ContentSettingsPattern::Wildcard(),
-                                    type,
-                                    std::string(),
-                                    ContentSettingFromString(setting));
+    settings_map->SetContentSetting(
+        ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+                                           pattern),
+        ContentSettingsPattern::Wildcard(),
+        type,
+        std::string(),
+        ContentSettingFromString(setting));
   }
 }
 
@@ -1449,7 +1461,8 @@ void ContentSettingsHandler::CheckExceptionPatternValidity(
   CHECK(args->GetString(2, &pattern_string));
 
   ContentSettingsPattern pattern =
-      ContentSettingsPattern::FromString(pattern_string);
+      ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+                                         pattern_string);
 
   web_ui()->CallJavascriptFunction(
       "ContentSettings.patternValidityCheckComplete",