Make WebContentsObserver::web_contents() public

extensions/browser/guest_view/guest_view_base.cc

 // Copyright 2014 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 "extensions/browser/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 175 matching lines @@
   enabled &= !min_auto_size_.IsEmpty() && !max_auto_size_.IsEmpty() &&
       IsAutoSizeSupported();
   if (!enabled && !auto_size_enabled_)
     return;
 
   auto_size_enabled_ = enabled;
 
   if (!attached())
     return;
 
-  content::RenderViewHost* rvh = guest_web_contents()->GetRenderViewHost();
+  content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
   if (auto_size_enabled_) {
     rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
   } else {
     rvh->DisableAutoResize(element_size_);
     guest_size_ = element_size_;
     GuestSizeChangedDueToAutoSize(guest_size_, element_size_);
   }
 }
 
 // static
@@ skipping 75 matching lines @@
   CHECK(!attached());
   CHECK_EQ(host->GetID(), embedder_render_process_id());
 
   // This code path may be reached if the embedder WebContents is killed for
   // whatever reason immediately after a called to GuestViewInternal.createGuest
   // and before attaching the new guest to a frame.
   Destroy();
 }
 
 void GuestViewBase::Destroy() {
-  DCHECK(guest_web_contents());
+  DCHECK(web_contents());
   content::RenderProcessHost* host =
       content::RenderProcessHost::FromID(embedder_render_process_id());
   if (host)
     host->RemoveObserver(this);
   WillDestroy();
   if (!destruction_callback_.is_null())
     destruction_callback_.Run();
 
-  webcontents_guestview_map.Get().erase(guest_web_contents());
+  webcontents_guestview_map.Get().erase(web_contents());
   GuestViewManager::FromBrowserContext(browser_context_)->
       RemoveGuest(guest_instance_id_);
   pending_events_.clear();
 
-  delete guest_web_contents();
+  delete web_contents();
 }
 
 void GuestViewBase::DidAttach() {
   // Give the derived class an opportunity to perform some actions.
   DidAttachToEmbedder();
 
   SendQueuedEvents();
 }
 
 void GuestViewBase::ElementSizeChanged(const gfx::Size& old_size,
@@ skipping 46 matching lines @@
                           "  window.event.preventDefault(); "
                           "});";
     render_view_host->GetMainFrame()->ExecuteJavaScript(
         base::ASCIIToUTF16(script));
   }
   DidStopLoading();
 }
 
 void GuestViewBase::RenderViewReady() {
   GuestReady();
-  content::RenderViewHost* rvh = guest_web_contents()->GetRenderViewHost();
+  content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
   if (auto_size_enabled_) {
     rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
   } else {
     rvh->DisableAutoResize(element_size_);
   }
 }
 
 void GuestViewBase::WebContentsDestroyed() {
   GuestDestroyed();
   delete this;
@@ skipping 65 matching lines @@
 }
 
 // static
 void GuestViewBase::RegisterGuestViewTypes() {
   AppViewGuest::Register();
   WebViewGuest::Register();
   ExtensionsAPIClient::Get()->RegisterGuestViewTypes();
 }
 
 }  // namespace extensions