BrowserPluginGuest/Embedder: Remove friend helper classes, made necessary calls public

content/browser/browser_plugin/browser_plugin_guest.h

 // Copyright (c) 2012 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.
 
 // A BrowserPluginGuest represents the browser side of browser <--> renderer
 // communication. A BrowserPlugin (a WebPlugin) is on the renderer side of
 // browser <--> guest renderer communication. The 'guest' renderer is a
 // <browser> tag.
 //
 // BrowserPluginGuest lives on the UI thread of the browser process. It has a
@@ skipping 58 matching lines @@
   // Overrides factory for testing. Default (NULL) value indicates regular
   // (non-test) environment.
   static void set_factory_for_testing(BrowserPluginHostFactory* factory) {
     content::BrowserPluginGuest::factory_ = factory;
   }
 
   void set_guest_hang_timeout_for_testing(const base::TimeDelta& timeout) {
     guest_hang_timeout_ = timeout;
   }
 
+  void set_embedder_render_process_host(
+      RenderProcessHost* render_process_host) {
+    embedder_render_process_host_ = render_process_host;
+  }
+
   // WebContentsObserver implementation.
   virtual void DidCommitProvisionalLoadForFrame(
       int64 frame_id,
       bool is_main_frame,
       const GURL& url,
       PageTransition transition_type,
       RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
 
   // WebContentsDelegate implementation.
   virtual void RendererUnresponsive(WebContents* source) OVERRIDE;
 
- private:
-  friend class BrowserPluginEmbedder;
-  friend class BrowserPluginGuestHelper;
-  friend class TestBrowserPluginGuest;
-
-  BrowserPluginGuest(int instance_id,
-                     WebContentsImpl* web_contents,
-                     RenderViewHost* render_view_host);
-
-  void set_embedder_render_process_host(
-      RenderProcessHost* render_process_host) {
-    embedder_render_process_host_ = render_process_host;
-  }
-  RenderProcessHost* embedder_render_process_host() {
-    return embedder_render_process_host_;
-  }
-  // Returns the identifier that uniquely identifies a browser plugin guest
-  // within an embedder.
-  int instance_id() const { return instance_id_; }
-  TransportDIB* damage_buffer() const { return damage_buffer_.get(); }
-  const gfx::Size& damage_view_size() const { return damage_view_size_; }
-  float damage_buffer_scale_factor() const {
-    return damage_buffer_scale_factor_;
-  }
   void SetDamageBuffer(TransportDIB* damage_buffer,
 #if defined(OS_WIN)
                        int damage_buffer_size,
 #endif
                        const gfx::Size& damage_view_size,
                        float scale_factor);
 
   void UpdateRect(RenderViewHost* render_view_host,
                   const ViewHostMsg_UpdateRect_Params& params);
   void UpdateRectACK(int message_id, const gfx::Size& size);
   // Handles input event routed through the embedder (which is initiated in the
   // browser plugin (renderer side of the embedder)).
   void HandleInputEvent(RenderViewHost* render_view_host,
                         const gfx::Rect& guest_rect,
                         const WebKit::WebInputEvent& event,
                         IPC::Message* reply_message);
   // Overrides default ShowWidget message so we show them on the correct
   // coordinates.
   void ShowWidget(RenderViewHost* render_view_host,
                   int route_id,
                   const gfx::Rect& initial_pos);
   void SetCursor(const WebCursor& cursor);
   // Handles input event acks so they are sent to browser plugin host (via
   // embedder) instead of default view/widget host.
   void HandleInputEventAck(RenderViewHost* render_view_host, bool handled);
 
+  WebContents* GetWebContents();

[Charlie Reis, 2012/09/20 18:24:04]

It's not immediately obvious why you need this.  Maybe add a comment like
"Expose the protected web_contents() from WebContentsObserver"?

[lazyboy, 2012/09/20 20:29:43]

Done.

+
+  // Overridden in tests.
+  virtual bool ViewTakeFocus(bool reverse);
+  // Overridden in tests.
+  virtual void SetFocus(bool focused);
+
+ private:
+  friend class TestBrowserPluginGuest;
+
+  BrowserPluginGuest(int instance_id,
+                     WebContentsImpl* web_contents,
+                     RenderViewHost* render_view_host);
+
+  RenderProcessHost* embedder_render_process_host() {
+    return embedder_render_process_host_;
+  }
+  // Returns the identifier that uniquely identifies a browser plugin guest
+  // within an embedder.
+  int instance_id() const { return instance_id_; }
+  TransportDIB* damage_buffer() const { return damage_buffer_.get(); }
+  const gfx::Size& damage_view_size() const { return damage_view_size_; }
+  float damage_buffer_scale_factor() const {
+    return damage_buffer_scale_factor_;
+  }
+
   // Helper to send messages to embedder. Overridden in test implementation
   // since we want to intercept certain messages for testing.
   virtual void SendMessageToEmbedder(IPC::Message* msg);
-  // Overridden in tests.
-  virtual void SetFocus(bool focused);
-  // Overridden in tests.
-  virtual bool ViewTakeFocus(bool reverse);
 
   // Static factory instance (always NULL for non-test).
   static content::BrowserPluginHostFactory* factory_;
 
   RenderProcessHost* embedder_render_process_host_;
   // An identifier that uniquely identifies a browser plugin guest within an
   // embedder.
   int instance_id_;
   scoped_ptr<TransportDIB> damage_buffer_;
 #if defined(OS_WIN)
   size_t damage_buffer_size_;
 #endif
   gfx::Size damage_view_size_;
   float damage_buffer_scale_factor_;
   scoped_ptr<IPC::Message> pending_input_event_reply_;
   gfx::Rect guest_rect_;
   WebCursor cursor_;
   IDMap<RenderViewHost> pending_updates_;
   int pending_update_counter_;
   base::TimeDelta guest_hang_timeout_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_