Send content settings based on the URL to the renderer instead of just the host.

chrome/renderer/render_view.h

 // 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.
 
 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 531 matching lines @@
   FRIEND_TEST(RenderViewTest, OnPrintPages);
   FRIEND_TEST(RenderViewTest, PrintWithIframe);
   FRIEND_TEST(RenderViewTest, PrintLayoutTest);
   FRIEND_TEST(RenderViewTest, OnHandleKeyboardEvent);
   FRIEND_TEST(RenderViewTest, InsertCharacters);
 #if defined(OS_MACOSX)
   FRIEND_TEST(RenderViewTest, MacTestCmdUp);
 #endif
   FRIEND_TEST(RenderViewTest, JSBlockSentAfterPageLoad);
 
-  typedef std::map<std::string, ContentSettings> HostContentSettings;
-  typedef std::map<std::string, int> HostZoomLevels;
+  typedef std::map<GURL, ContentSettings> HostContentSettings;
+  typedef std::map<GURL, int> HostZoomLevels;
 
   explicit RenderView(RenderThreadBase* render_thread,
                       const WebPreferences& webkit_preferences,
                       int64 session_storage_namespace_id);
 
   // Initializes this view with the given parent and ID. The |routing_id| can be
   // set to 'MSG_ROUTING_NONE' if the true ID is not yet known. In this case,
   // CompleteInit must be called later with the true ID.
   void Init(gfx::NativeViewId parent,
             int32 opener_id,
@@ skipping 82 matching lines @@
   void OnSelectAll();
   void OnCopyImageAt(int x, int y);
   void OnExecuteEditCommand(const std::string& name, const std::string& value);
   void OnSetEditCommandsForNextKeyEvent(const EditCommands& edit_commands);
   void OnSetupDevToolsClient();
   void OnCancelDownload(int32 download_id);
   void OnFind(int request_id, const string16&, const WebKit::WebFindOptions&);
   void OnStopFinding(const ViewMsg_StopFinding_Params& params);
   void OnFindReplyAck();
   void OnDeterminePageLanguage();
-  void OnSetContentSettingsForLoadingHost(
-      std::string host, const ContentSettings& content_settings);
+  void OnSetContentSettingsForLoadingURL(
+      const GURL& url, const ContentSettings& content_settings);
   void OnZoom(PageZoom::Function function);
-  void OnSetZoomLevelForLoadingHost(std::string host, int zoom_level);
+  void OnSetZoomLevelForLoadingURL(const GURL& url, int zoom_level);
   void OnSetPageEncoding(const std::string& encoding_name);
   void OnResetPageEncodingToDefault();
   void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url);
   void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
       const std::vector<GURL>& links,
       const std::vector<FilePath>& local_paths,
       const FilePath& local_directory_name);
   void OnFillPasswordForm(
       const webkit_glue::PasswordFormDomManager::FillData& form_data);
   void OnDragTargetDragEnter(const WebDropData& drop_data,
@@ skipping 531 matching lines @@
 
   // Site isolation metrics flags.  These are per-page-load counts, reset to 0
   // in OnClosePage.
   int cross_origin_access_count_;
   int same_origin_access_count_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_