Clean content_settings_pattern_parser.* from unnecessary dependencies.

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

 // Copyright 2014 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/ui/webui/options/website_settings_handler.h"
 
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_ui.h"
+#include "extensions/common/constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/text/bytes_formatting.h"
 
 namespace {
 
 const char kPreferencesSource[] = "preference";
 const char kStorage[] = "storage";
 const ContentSettingsType kValidTypes[] = {CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                            CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
@@ skipping 109 matching lines @@
   for (ContentSettingsForOneType::const_iterator it = all_settings.begin();
        it != all_settings.end();
        ++it) {
     // Don't add default settings.
     if (it->primary_pattern == ContentSettingsPattern::Wildcard() &&
         it->secondary_pattern == ContentSettingsPattern::Wildcard() &&
         it->source != kPreferencesSource) {
       continue;
     }
 
-    std::string origin = it->primary_pattern.ToString();
+    std::string origin =
+        it->primary_pattern.ToString(extensions::kExtensionScheme);
 
     // Mediastream isn't set unless both mic and camera are set to the same.
     if (last_setting == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
       GURL origin_url(origin);
       ContentSetting cam_setting =
           settings->GetContentSetting(origin_url,
                                       origin_url,
                                       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
                                       std::string());
       if (it->setting != cam_setting)
@@ skipping 36 matching lines @@
         "usage", new base::FundamentalValue(static_cast<double>(it->size)));
     origin_entry->SetWithoutPathExpansion(
         "usageString", new base::StringValue(ui::FormatBytes(it->size)));
     local_storage_map.SetWithoutPathExpansion(origin, origin_entry);
   }
   web_ui()->CallJavascriptFunction("WebsiteSettingsManager.populateOrigins",
                                    local_storage_map);
 }
 
 }  // namespace options