Merge 188631 "Don't throw exceptions when v8 objects/contexts ar..."

chrome/renderer/extensions/extension_helper.h

Index: chrome/renderer/extensions/extension_helper.h
===================================================================
--- chrome/renderer/extensions/extension_helper.h	(revision 188637)
+++ chrome/renderer/extensions/extension_helper.h	(working copy)
@@ -56,11 +56,8 @@
   int tab_id() const { return tab_id_; }
   int browser_window_id() const { return browser_window_id_; }
   chrome::ViewType view_type() const { return view_type_; }
+  Dispatcher* dispatcher() const { return dispatcher_; }
 
-  // Helper to add a logging message to the root frame's console.
-  void AddMessageToRootConsole(content::ConsoleMessageLevel level,
-                               const std::string& message);
-
  private:
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
@@ -99,10 +96,6 @@
                              const std::string& message);
   void OnAppWindowClosed();
 
-  // Helper to add a logging message to the root frame's console.
-  void AddMessageToRootConsole(content::ConsoleMessageLevel level,
-                               const string16& message);
-
   Dispatcher* dispatcher_;
 
   // The app info that we are processing. This is used when installing an app