Propagating csp attribute changes on frameOwnerPropertiesChanged()

content/common/frame_owner_properties.cc

Index: content/common/frame_owner_properties.cc
diff --git a/content/common/frame_owner_properties.cc b/content/common/frame_owner_properties.cc
index aca8709cbc09885515b032908dd4d6d66bde08d4..e414998a63d95720cf7b1a2ea0a5a720c2577729 100644
--- a/content/common/frame_owner_properties.cc
+++ b/content/common/frame_owner_properties.cc
@@ -10,7 +10,8 @@ FrameOwnerProperties::FrameOwnerProperties()
     : scrolling_mode(blink::WebFrameOwnerProperties::ScrollingMode::Auto),
       margin_width(-1),
       margin_height(-1),
-      allow_fullscreen(false) {}
+      allow_fullscreen(false),
+      csp("") {}

[Mike West, 2016/09/29 08:58:53]

I think the default initializer would be fine here.

 
 FrameOwnerProperties::FrameOwnerProperties(const FrameOwnerProperties& other) =
     default;
@@ -21,6 +22,7 @@ FrameOwnerProperties::FrameOwnerProperties(
       margin_width(web_frame_owner_properties.marginWidth),
       margin_height(web_frame_owner_properties.marginHeight),
       allow_fullscreen(web_frame_owner_properties.allowFullscreen),
+      csp(web_frame_owner_properties.csp.utf8()),
       delegated_permissions(
           web_frame_owner_properties.delegatedPermissions.begin(),
           web_frame_owner_properties.delegatedPermissions.end()) {}
@@ -35,6 +37,7 @@ blink::WebFrameOwnerProperties FrameOwnerProperties::ToWebFrameOwnerProperties()
   result.marginWidth = margin_width;
   result.marginHeight = margin_height;
   result.allowFullscreen = allow_fullscreen;
+  result.csp = blink::WebString::fromUTF8(csp);
   result.delegatedPermissions =
       blink::WebVector<blink::WebPermissionType>(delegated_permissions);
 
@@ -46,6 +49,7 @@ bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const {
          margin_width == other.margin_width &&
          margin_height == other.margin_height &&
          allow_fullscreen == other.allow_fullscreen &&
+         csp.compare(other.csp) == 0 &&

[Mike West, 2016/09/29 08:58:53]

`==` should be fine here.

          std::equal(delegated_permissions.begin(), delegated_permissions.end(),
                     other.delegated_permissions.begin());
 }