Adding CookieSettings for storing cookie content settings.

chrome/browser/content_settings/tab_specific_content_settings.cc

 // Copyright (c) 2011 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/content_settings/tab_specific_content_settings.h"
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 470 matching lines @@
   if (settings_details.ptr()->update_all() ||
       // The active NavigationEntry is the URL in the URL field of a tab.
       // Currently this should be matched by the |primary_pattern|.
       settings_details.ptr()->primary_pattern().Matches(entry_url)) {
     Profile* profile =
         Profile::FromBrowserContext(tab_contents()->browser_context());
     HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
     Send(new ChromeViewMsg_SetDefaultContentSettings(
         map->GetDefaultContentSettings()));
     Send(new ChromeViewMsg_SetContentSettingsForCurrentURL(
-        entry_url, map->GetContentSettings(entry_url, entry_url)));
+        entry_url, map->GetContentSettings(entry_url)));
     ContentSettingsForOneType settings;
     map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings);
     Send(new ChromeViewMsg_SetImageSettingRules(settings));
   }
 }
 
 TabSpecificContentSettings::LocalSharedObjectsContainer::
     LocalSharedObjectsContainer(Profile* profile)
     : appcaches_(new CannedBrowsingDataAppCacheHelper(profile)),
       cookies_(new CannedBrowsingDataCookieHelper(profile)),
@@ skipping 23 matching lines @@
   return new CookiesTreeModel(cookies_->Clone(),
                               databases_->Clone(),
                               local_storages_->Clone(),
                               session_storages_->Clone(),
                               appcaches_->Clone(),
                               indexed_dbs_->Clone(),
                               file_systems_->Clone(),
                               NULL,
                               true);
 }