| Index: extensions/renderer/guest_view/guest_view_container.cc
|
| diff --git a/extensions/renderer/guest_view/guest_view_container.cc b/extensions/renderer/guest_view/guest_view_container.cc
|
| index 8ef8054ae714ce18059109e5f2029960d9d28113..22548bc5bafc39ac6e28e9d7e5689caa8e73cd63 100644
|
| --- a/extensions/renderer/guest_view/guest_view_container.cc
|
| +++ b/extensions/renderer/guest_view/guest_view_container.cc
|
| @@ -23,9 +23,8 @@ static base::LazyInstance<GuestViewContainerMap> g_guest_view_container_map =
|
|
|
| namespace extensions {
|
|
|
| -GuestViewContainer::GuestViewContainer(
|
| - content::RenderFrame* render_frame,
|
| - const std::string& mime_type)
|
| +GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame,
|
| + const std::string& mime_type)
|
| : content::BrowserPluginDelegate(render_frame, mime_type),
|
| content::RenderFrameObserver(render_frame),
|
| mime_type_(mime_type),
|
| @@ -33,7 +32,7 @@ GuestViewContainer::GuestViewContainer(
|
| render_view_routing_id_(render_frame->GetRenderView()->GetRoutingID()),
|
| attached_(false),
|
| attach_pending_(false),
|
| - isolate_(NULL) {
|
| + isolate_(nullptr) {
|
| }
|
|
|
| GuestViewContainer::~GuestViewContainer() {
|
| @@ -49,7 +48,7 @@ GuestViewContainer* GuestViewContainer::FromID(int render_view_routing_id,
|
| g_guest_view_container_map.Pointer();
|
| GuestViewContainerMap::iterator it = guest_view_containers->find(
|
| GuestViewID(render_view_routing_id, element_instance_id));
|
| - return it == guest_view_containers->end() ? NULL : it->second;
|
| + return it == guest_view_containers->end() ? nullptr : it->second;
|
| }
|
|
|
|
|
|
|