Remove most references to VarPrivate/InstancePrivate from OOP PDF

pdf/out_of_process_instance.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.
 
 #ifndef PDF_OUT_OF_PROCESS_INSTANCE_H_
 #define PDF_OUT_OF_PROCESS_INSTANCE_H_
 
 #include <queue>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "pdf/paint_manager.h"
 #include "pdf/pdf_engine.h"
 #include "pdf/preview_mode_client.h"
 
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/cpp/dev/printing_dev.h"
 #include "ppapi/cpp/dev/scriptable_object_deprecated.h"
 #include "ppapi/cpp/dev/selection_dev.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/input_event.h"
+#include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/private/find_private.h"
-#include "ppapi/cpp/private/instance_private.h"
 #include "ppapi/cpp/private/uma_private.h"
 #include "ppapi/cpp/private/var_private.h"
 #include "ppapi/cpp/url_loader.h"
 #include "ppapi/utility/completion_callback_factory.h"
 
 namespace pp {
 class TextInput_Dev;
 }
 
 namespace chrome_pdf {
 
-class OutOfProcessInstance : public pp::InstancePrivate,
+class OutOfProcessInstance : public pp::Instance,
                              public pp::Find_Private,
                              public pp::Printing_Dev,
                              public pp::Selection_Dev,
                              public PaintManager::Client,
                              public PDFEngine::Client,
                              public PreviewModeClient::Client {
  public:
   explicit OutOfProcessInstance(PP_Instance instance);
   virtual ~OutOfProcessInstance();
 
   // pp::Instance implementation.
   virtual bool Init(uint32_t argc,
                     const char* argn[],
                     const char* argv[]) OVERRIDE;
   virtual void HandleMessage(const pp::Var& message) OVERRIDE;
   virtual bool HandleInputEvent(const pp::InputEvent& event) OVERRIDE;
   virtual void DidChangeView(const pp::View& view) OVERRIDE;
-  virtual pp::Var GetInstanceObject() OVERRIDE;
 
   // pp::Find_Private implementation.
   virtual bool StartFind(const std::string& text, bool case_sensitive) OVERRIDE;
   virtual void SelectFindResult(bool forward) OVERRIDE;
   virtual void StopFind() OVERRIDE;
 
   // pp::PaintManager::Client implementation.
   virtual void OnPaint(const std::vector<pp::Rect>& paint_rects,
                        std::vector<PaintManager::ReadyRect>* ready,
                        std::vector<pp::Rect>* pending) OVERRIDE;
@@ skipping 261 matching lines @@
   // be painted until this is received.
   bool received_viewport_message_;
 
   // The callback for receiving the password from the page.
   scoped_ptr<pp::CompletionCallbackWithOutput<pp::Var> > password_callback_;
 };
 
 }  // namespace chrome_pdf
 
 #endif  // PDF_OUT_OF_PROCESS_INSTANCE_H_