Replace std::map with std::pair for (origin, engagement) tuples in RenderFrameImpl.

content/renderer/render_frame_impl.h

 // Copyright 2013 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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 749 matching lines @@
 
     int id_;
     bool notify_result_;
     int routing_id_;
     base::WeakPtr<RenderFrameImpl> render_frame_impl_;
 
     DISALLOW_COPY_AND_ASSIGN(JavaScriptIsolatedWorldRequest);
   };
 
   typedef std::map<GURL, double> HostZoomLevels;
-  typedef std::map<url::Origin, blink::mojom::EngagementLevel> EngagementLevels;
+  typedef std::pair<url::Origin, blink::mojom::EngagementLevel>
+      EngagementOriginAndLevel;
 
   // Creates a new RenderFrame. |render_view| is the RenderView object that this
   // frame belongs to.
   // Callers *must* call |BindToWebFrame| immediately after creation.
   static RenderFrameImpl* Create(RenderViewImpl* render_view,
                                  int32_t routing_id);
 
   // This is called right after creation with the WebLocalFrame for this
   // RenderFrame. It must be called before Initialize.
   void BindToWebFrame(blink::WebLocalFrame* web_frame);
@@ skipping 568 matching lines @@
   PepperPluginInstanceImpl* focused_pepper_plugin_;
 
   // The plugin instance that received the last mouse event. It is set to NULL
   // if the last mouse event went to elements other than Pepper plugins.
   // |pepper_last_mouse_event_target_| is not owned by this class. We depend on
   // the RenderFrameImpl to NULL it out when it destructs.
   PepperPluginInstanceImpl* pepper_last_mouse_event_target_;
 #endif
 
   HostZoomLevels host_zoom_levels_;
-  EngagementLevels engagement_levels_;
+  EngagementOriginAndLevel engagement_level_;
 
   mojo::AssociatedBinding<blink::mojom::EngagementClient> engagement_binding_;
   mojo::Binding<mojom::Frame> frame_binding_;
   mojo::AssociatedBinding<mojom::HostZoom> host_zoom_binding_;
   mojom::FrameHostPtr frame_host_;
 
   // Indicates whether |didAccessInitialDocument| was called.
   bool has_accessed_initial_document_;
 
   AssociatedInterfaceRegistryImpl associated_interfaces_;
   std::unique_ptr<AssociatedInterfaceProviderImpl>
       remote_associated_interfaces_;
 
   // TODO(dcheng): Remove these members.
   bool committed_first_load_ = false;
   bool name_changed_before_first_commit_ = false;
 
   bool browser_side_navigation_pending_ = false;
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_