Remove Gears from Chrome.

There are probably a few more bits and pieces that can be removed, but I think this is the majority of it.

BUG=51934

Review URL: http://codereview.chromium.org/6576020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77888 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 869 deletions

diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
deleted file mode 100644
index f402f16e..0000000
--- a/chrome/plugin/chrome_plugin_host.cc
+++ /dev/null
@@ -1,731 +0,0 @@
-// Copyright (c) 2011 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 "chrome/plugin/chrome_plugin_host.h"
-
-#include "base/command_line.h"
-#include "base/file_path.h"
-#include "base/file_util.h"
-#include "base/message_loop.h"
-#include "base/process_util.h"
-#include "base/utf_string_conversions.h"
-#include "base/string_split.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_plugin_lib.h"
-#include "chrome/common/chrome_plugin_util.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/plugin_messages.h"
-#include "chrome/plugin/plugin_thread.h"
-#include "chrome/plugin/webplugin_proxy.h"
-#include "content/common/child_process.h"
-#include "content/common/resource_dispatcher.h"
-#include "net/base/data_url.h"
-#include "net/base/io_buffer.h"
-#include "net/base/upload_data.h"
-#include "net/http/http_response_headers.h"
-#include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/glue/resource_loader_bridge.h"
-#include "webkit/glue/resource_type.h"
-#include "webkit/glue/webkit_glue.h"
-
-namespace {
-
-using webkit_glue::ResourceLoaderBridge;
-using webkit_glue::ResourceResponseInfo;
-
-static MessageLoop* g_plugin_thread_message_loop;
-
-// This class manages a network request made by the plugin, handling the
-// data as it comes in from the ResourceLoaderBridge and is requested by the
-// plugin.
-// NOTE: All methods must be called on the Plugin thread.
-class PluginRequestHandlerProxy
-    : public PluginHelper, public ResourceLoaderBridge::Peer {
- public:
-  static PluginRequestHandlerProxy* FromCPRequest(CPRequest* request) {
-    return ScopableCPRequest::GetData<PluginRequestHandlerProxy*>(request);
-  }
-
-  PluginRequestHandlerProxy(ChromePluginLib* plugin,
-                            ScopableCPRequest* cprequest)
-      : PluginHelper(plugin),
-        cprequest_(cprequest),
-        sync_(false),
-        response_data_offset_(0),
-        completed_(false),
-        read_buffer_(NULL),
-        read_buffer_size_(0) {
-    load_flags_ = PluginResponseUtils::CPLoadFlagsToNetFlags(0);
-    cprequest_->data = this;  // see FromCPRequest().
-  }
-
-  ~PluginRequestHandlerProxy() {
-    if (bridge_.get() && !completed_) {
-      bridge_->Cancel();
-    }
-  }
-
-  // ResourceLoaderBridge::Peer
-  virtual void OnUploadProgress(uint64 position, uint64 size) {
-    CPRR_UploadProgressFunc upload_progress =
-        plugin_->functions().response_funcs->upload_progress;
-    if (upload_progress)
-      upload_progress(cprequest_.get(), position, size);
-  }
-
-  virtual bool OnReceivedRedirect(
-      const GURL& new_url,
-      const ResourceResponseInfo& info,
-      bool* has_new_first_party_for_cookies,
-      GURL* new_first_party_for_cookies) {
-    plugin_->functions().response_funcs->received_redirect(
-        cprequest_.get(), new_url.spec().c_str());
-    // TODO(wtc): should we return a new first party for cookies URL?
-    *has_new_first_party_for_cookies = false;
-    return true;
-  }
-
-  virtual void OnReceivedResponse(const ResourceResponseInfo& info) {
-    response_headers_ = info.headers;
-    plugin_->functions().response_funcs->start_completed(
-        cprequest_.get(), CPERR_SUCCESS);
-  }
-
-  virtual void OnDownloadedData(int len) {
-  }
-
-  virtual void OnReceivedData(const char* data, int len) {
-    response_data_.append(data, len);
-    if (read_buffer_) {
-      // If we had an asynchronous operation pending, read into that buffer
-      // and inform the plugin.
-      int rv = Read(read_buffer_, read_buffer_size_);
-      DCHECK(rv != CPERR_IO_PENDING);
-      read_buffer_ = NULL;
-      plugin_->functions().response_funcs->read_completed(
-          cprequest_.get(), rv);
-    }
-  }
-
-  virtual void OnCompletedRequest(const net::URLRequestStatus& status,
-                                  const std::string& security_info,
-                                  const base::Time& completion_time) {
-    completed_ = true;
-
-    if (!status.is_success()) {
-      // TODO(mpcomplete): better error codes
-      // Inform the plugin, calling the right function depending on whether
-      // we got the start_completed event or not.
-      if (response_headers_) {
-        plugin_->functions().response_funcs->start_completed(
-            cprequest_.get(), CPERR_FAILURE);
-      } else {
-        plugin_->functions().response_funcs->read_completed(
-            cprequest_.get(), CPERR_FAILURE);
-      }
-    } else if (read_buffer_) {
-      // The plugin was waiting for more data.  Inform him we're done.
-      read_buffer_ = NULL;
-      plugin_->functions().response_funcs->read_completed(
-          cprequest_.get(), CPERR_SUCCESS);
-    }
-  }
-
-  void set_extra_headers(const std::string& headers) {
-    extra_headers_ = headers;
-  }
-  void set_load_flags(uint32 flags) {
-    load_flags_ = flags;
-  }
-  void set_sync(bool sync) {
-    sync_ = sync;
-  }
-  void AppendDataToUpload(const char* bytes, int bytes_len) {
-    upload_content_.push_back(net::UploadData::Element());
-    upload_content_.back().SetToBytes(bytes, bytes_len);
-  }
-
-  void AppendFileToUpload(const FilePath &filepath) {
-    AppendFileRangeToUpload(filepath, 0, kuint64max);
-  }
-
-  void AppendFileRangeToUpload(const FilePath &filepath,
-                               uint64 offset, uint64 length) {
-    upload_content_.push_back(net::UploadData::Element());
-    upload_content_.back().SetToFilePathRange(filepath, offset, length,
-                                              base::Time());
-  }
-
-  CPError Start(int renderer_id, int render_view_id) {
-    webkit_glue::ResourceLoaderBridge::RequestInfo request_info;
-    request_info.method = cprequest_->method;
-    request_info.url = GURL(cprequest_->url);
-    request_info.first_party_for_cookies =
-        GURL(cprequest_->url); // TODO(jackson): policy url?
-    request_info.referrer = GURL();  // TODO(mpcomplete): referrer?
-    request_info.headers = extra_headers_;
-    request_info.load_flags = load_flags_;
-    request_info.requestor_pid = base::GetCurrentProcId();
-    request_info.request_type = ResourceType::OBJECT;
-    request_info.request_context = cprequest_->context;
-    request_info.appcache_host_id = appcache::kNoHostId;
-    request_info.routing_id = MSG_ROUTING_CONTROL;
-    bridge_.reset(
-        PluginThread::current()->resource_dispatcher()->CreateBridge(
-            request_info,
-            renderer_id,
-            render_view_id));
-    if (!bridge_.get())
-      return CPERR_FAILURE;
-
-    for (size_t i = 0; i < upload_content_.size(); ++i) {
-      switch (upload_content_[i].type()) {
-        case net::UploadData::TYPE_BYTES: {
-          const std::vector<char>& bytes = upload_content_[i].bytes();
-          bridge_->AppendDataToUpload(&bytes[0],
-                                      static_cast<int>(bytes.size()));
-          break;
-        }
-        case net::UploadData::TYPE_FILE: {
-          bridge_->AppendFileRangeToUpload(
-              upload_content_[i].file_path(),
-              upload_content_[i].file_range_offset(),
-              upload_content_[i].file_range_length(),
-              upload_content_[i].expected_file_modification_time());
-          break;
-        }
-        default: {
-          NOTREACHED() << "Unknown UploadData::Element type";
-        }
-      }
-    }
-
-    if (sync_) {
-      ResourceLoaderBridge::SyncLoadResponse response;
-      bridge_->SyncLoad(&response);
-      response_headers_ = response.headers;
-      response_data_ = response.data;
-      completed_ = true;
-      return response.status.is_success() ? CPERR_SUCCESS : CPERR_FAILURE;
-    } else {
-      if (!bridge_->Start(this)) {
-        bridge_.reset();
-        return CPERR_FAILURE;
-      }
-      return CPERR_IO_PENDING;
-    }
-  }
-
-  int GetResponseInfo(CPResponseInfoType type, void* buf, uint32 buf_size) {
-    return PluginResponseUtils::GetResponseInfo(
-        response_headers_, type, buf, buf_size);
-  }
-
-  int Read(void* buf, uint32 buf_size) {
-    uint32 avail =
-        static_cast<uint32>(response_data_.size()) - response_data_offset_;
-    uint32 count = buf_size;
-    if (count > avail)
-      count = avail;
-
-    if (count) {
-      // Data is ready now.
-      memcpy(buf, &response_data_[0] + response_data_offset_, count);
-      response_data_offset_ += count;
-    } else if (!completed_) {
-      read_buffer_ = buf;
-      read_buffer_size_ = buf_size;
-      DCHECK(!sync_);
-      return CPERR_IO_PENDING;
-    }
-
-    if (response_data_.size() == response_data_offset_) {
-      // Simple optimization for large requests.  Generally the consumer will
-      // read the data faster than it comes in, so we can clear our buffer
-      // any time it has all been read.
-      response_data_.clear();
-      response_data_offset_ = 0;
-    }
-
-    read_buffer_ = NULL;
-    return count;
-  }
-
- private:
-  scoped_ptr<ScopableCPRequest> cprequest_;
-  scoped_ptr<ResourceLoaderBridge> bridge_;
-  std::vector<net::UploadData::Element> upload_content_;
-  std::string extra_headers_;
-  uint32 load_flags_;
-  bool sync_;
-
-  scoped_refptr<net::HttpResponseHeaders> response_headers_;
-  std::string response_data_;
-  size_t response_data_offset_;
-  bool completed_;
-  void* read_buffer_;
-  uint32 read_buffer_size_;
-};
-
-//
-// Generic functions
-//
-
-void STDCALL CPB_SetKeepProcessAlive(CPID id, CPBool keep_alive) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  static bool g_keep_process_alive = false;
-  bool desired_value = keep_alive ? true : false;  // smash to bool
-  if (desired_value != g_keep_process_alive) {
-    g_keep_process_alive = desired_value;
-    if (g_keep_process_alive)
-      ChildProcess::current()->AddRefProcess();
-    else
-      ChildProcess::current()->ReleaseProcess();
-  }
-}
-
-CPError STDCALL CPB_GetCookies(CPID id, CPBrowsingContext context,
-                               const char* url, char** cookies) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  std::string cookies_str;
-
-  WebPluginProxy* webplugin = WebPluginProxy::FromCPBrowsingContext(context);
-  // There are two contexts in which we can be asked for cookies:
-  // 1. From a script context.  webplugin will be non-NULL.
-  // 2. From a global browser context (think: Gears UpdateTask).  webplugin will
-  //    be NULL and context will (loosely) represent a browser Profile.
-  // In case 1, we *must* route through the renderer process, otherwise we race
-  // with renderer script that may have set cookies.  In case 2, we are running
-  // out-of-band with script, so we don't need to stay in sync with any
-  // particular renderer.
-  // See http://b/issue?id=1487502.
-  if (webplugin) {
-    cookies_str = webplugin->GetCookies(GURL(url), GURL(url));
-  } else {
-    PluginThread::current()->Send(
-        new PluginProcessHostMsg_GetCookies(context, GURL(url), &cookies_str));
-  }
-
-  *cookies = CPB_StringDup(CPB_Alloc, cookies_str);
-  return CPERR_SUCCESS;
-}
-
-CPError STDCALL CPB_ShowHtmlDialogModal(
-    CPID id, CPBrowsingContext context, const char* url, int width, int height,
-    const char* json_arguments, char** json_retval) {
-  CHECK(ChromePluginLib::IsPluginThread());
-
-  WebPluginProxy* webplugin = WebPluginProxy::FromCPBrowsingContext(context);
-  if (!webplugin)
-    return CPERR_INVALID_PARAMETER;
-
-  std::string retval_str;
-  webplugin->ShowModalHTMLDialog(
-      GURL(url), width, height, json_arguments, &retval_str);
-  *json_retval = CPB_StringDup(CPB_Alloc, retval_str);
-  return CPERR_SUCCESS;
-}
-
-CPError STDCALL CPB_ShowHtmlDialog(
-    CPID id, CPBrowsingContext context, const char* url, int width, int height,
-    const char* json_arguments, void* plugin_context) {
-  // TODO(mpcomplete): support non-modal dialogs.
-  return CPERR_FAILURE;
-}
-
-CPError STDCALL CPB_GetDragData(
-    CPID id, CPBrowsingContext context, struct NPObject* event, bool add_data,
-    int32 *identity, int32 *event_id, char **drag_type, char **drag_data) {
-  CHECK(ChromePluginLib::IsPluginThread());
-
-  *identity = *event_id = 0;
-  WebPluginProxy* webplugin = WebPluginProxy::FromCPBrowsingContext(context);
-  if (!event || !webplugin)
-    return CPERR_INVALID_PARAMETER;
-
-  std::string type_str, data_str;
-  if (!webplugin->GetDragData(event, add_data,
-                              identity, event_id, &type_str, &data_str)) {
-    return CPERR_FAILURE;
-  }
-
-  if (add_data)
-    *drag_data = CPB_StringDup(CPB_Alloc, data_str);
-  *drag_type = CPB_StringDup(CPB_Alloc, type_str);
-  return CPERR_SUCCESS;
-}
-
-CPError STDCALL CPB_SetDropEffect(
-    CPID id, CPBrowsingContext context, struct NPObject* event, int effect) {
-  CHECK(ChromePluginLib::IsPluginThread());
-
-  WebPluginProxy* webplugin = WebPluginProxy::FromCPBrowsingContext(context);
-  if (!event || !webplugin)
-    return CPERR_INVALID_PARAMETER;
-
-  if (webplugin->SetDropEffect(event, effect))
-    return CPERR_SUCCESS;
-  return CPERR_FAILURE;
-}
-
-CPError STDCALL CPB_AllowFileDrop(
-    CPID id, CPBrowsingContext context, const char* file_drag_data) {
-  CHECK(ChromePluginLib::IsPluginThread());
-
-  WebPluginProxy* webplugin = WebPluginProxy::FromCPBrowsingContext(context);
-  if (!webplugin || !file_drag_data)
-    return CPERR_INVALID_PARAMETER;
-
-  const int renderer = webplugin->GetRendererId();
-  if (renderer == -1)
-    return CPERR_FAILURE;
-
-  static const char kDelimiter('\b');
-  std::vector<std::string> files;
-  base::SplitStringDontTrim(file_drag_data, kDelimiter, &files);
-
-  bool allowed = false;
-  if (!PluginThread::current()->Send(
-          new PluginProcessHostMsg_AccessFiles(renderer, files, &allowed))) {
-    return CPERR_FAILURE;
-  }
-
-  if (allowed)
-    return CPERR_SUCCESS;
-  return CPERR_FAILURE;
-}
-
-CPError STDCALL CPB_GetCommandLineArguments(
-    CPID id, CPBrowsingContext context, const char* url, char** arguments) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  std::string arguments_str;
-  CPError rv = CPB_GetCommandLineArgumentsCommon(url, &arguments_str);
-  if (rv == CPERR_SUCCESS)
-    *arguments = CPB_StringDup(CPB_Alloc, arguments_str);
-  return rv;
-}
-
-CPBrowsingContext STDCALL CPB_GetBrowsingContextFromNPP(NPP npp) {
-  if (!npp)
-    return CPERR_INVALID_PARAMETER;
-
-  webkit::npapi::PluginInstance* instance =
-      static_cast<webkit::npapi::PluginInstance *>(npp->ndata);
-  WebPluginProxy* webplugin =
-      static_cast<WebPluginProxy*>(instance->webplugin());
-
-  return webplugin->GetCPBrowsingContext();
-}
-
-int STDCALL CPB_GetBrowsingContextInfo(
-    CPID id, CPBrowsingContext context, CPBrowsingContextInfoType type,
-    void* buf, uint32 buf_size) {
-  CHECK(ChromePluginLib::IsPluginThread());
-
-#if defined(OS_WIN)
-  switch (type) {
-  case CPBROWSINGCONTEXT_DATA_DIR_PTR: {
-    if (buf_size < sizeof(char*))
-      return sizeof(char*);
-
-    FilePath path = CommandLine::ForCurrentProcess()->
-                    GetSwitchValuePath(switches::kPluginDataDir);
-    DCHECK(!path.empty());
-    std::string retval = WideToUTF8(
-        path.Append(chrome::kChromePluginDataDirname).value());
-    *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, retval);
-
-    return CPERR_SUCCESS;
-    }
-  case CPBROWSINGCONTEXT_UI_LOCALE_PTR: {
-    if (buf_size < sizeof(char*))
-      return sizeof(char*);
-
-    std::string retval = webkit_glue::GetWebKitLocale();
-    *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, retval);
-    return CPERR_SUCCESS;
-    }
-  }
-#else
-  // TODO(aa): this code is only used by Gears, which we are removing.
-  NOTREACHED();
-#endif
-
-  return CPERR_FAILURE;
-}
-
-CPError STDCALL CPB_AddUICommand(CPID id, int command) {
-  // Not implemented in the plugin process
-  return CPERR_FAILURE;
-}
-
-CPError STDCALL CPB_HandleCommand(
-    CPID id, CPBrowsingContext context, int command, void *data) {
-  // Not implemented in the plugin process
-  return CPERR_FAILURE;
-}
-
-//
-// Functions related to network interception
-//
-
-void STDCALL CPB_EnableRequestIntercept(
-    CPID id, const char** schemes, uint32 num_schemes) {
-  // We ignore requests by the plugin to intercept from this process.  That's
-  // handled in the browser process.
-}
-
-void STDCALL CPRR_ReceivedRedirect(CPRequest* request, const char* new_url) {
-  NOTREACHED() << "Network interception should not happen in plugin process.";
-}
-
-void STDCALL CPRR_StartCompleted(CPRequest* request, CPError result) {
-  NOTREACHED() << "Network interception should not happen in plugin process.";
-}
-
-void STDCALL CPRR_ReadCompleted(CPRequest* request, int bytes_read) {
-  NOTREACHED() << "Network interception should not happen in plugin process.";
-}
-
-void STDCALL CPRR_UploadProgress(CPRequest* request, uint64 pos, uint64 size) {
-  NOTREACHED() << "Network interception should not happen in plugin process.";
-}
-
-//
-// Functions related to serving network requests to the plugin
-//
-
-CPError STDCALL CPB_CreateRequest(CPID id, CPBrowsingContext context,
-                                  const char* method, const char* url,
-                                  CPRequest** request) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  ChromePluginLib* plugin = ChromePluginLib::FromCPID(id);
-  CHECK(plugin);
-
-  ScopableCPRequest* cprequest = new ScopableCPRequest(url, method, context);
-  new PluginRequestHandlerProxy(plugin, cprequest);
-
-  *request = cprequest;
-  return CPERR_SUCCESS;
-}
-
-CPError STDCALL CPR_StartRequest(CPRequest* request) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  PluginRequestHandlerProxy* handler =
-      PluginRequestHandlerProxy::FromCPRequest(request);
-  CHECK(handler);
-
-  int renderer_id = -1;
-  int render_view_id = -1;
-
-  WebPluginProxy* webplugin = WebPluginProxy::FromCPBrowsingContext(
-      request->context);
-  if (webplugin) {
-    renderer_id = webplugin->GetRendererId();
-    if (renderer_id == -1)
-      return CPERR_FAILURE;
-
-    render_view_id = webplugin->host_render_view_routing_id();
-    if (render_view_id == -1)
-      return CPERR_FAILURE;
-  }
-
-  return handler->Start(renderer_id, render_view_id);
-}
-
-void STDCALL CPR_EndRequest(CPRequest* request, CPError reason) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  PluginRequestHandlerProxy* handler =
-      PluginRequestHandlerProxy::FromCPRequest(request);
-  delete handler;
-}
-
-void STDCALL CPR_SetExtraRequestHeaders(CPRequest* request,
-                                        const char* headers) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  PluginRequestHandlerProxy* handler =
-      PluginRequestHandlerProxy::FromCPRequest(request);
-  CHECK(handler);
-  handler->set_extra_headers(headers);
-}
-
-void STDCALL CPR_SetRequestLoadFlags(CPRequest* request, uint32 flags) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  PluginRequestHandlerProxy* handler =
-      PluginRequestHandlerProxy::FromCPRequest(request);
-  CHECK(handler);
-
-  if (flags & CPREQUESTLOAD_SYNCHRONOUS) {
-    handler->set_sync(true);
-  }
-
-  uint32 net_flags = PluginResponseUtils::CPLoadFlagsToNetFlags(flags);
-  handler->set_load_flags(net_flags);
-}
-
-void STDCALL CPR_AppendDataToUpload(CPRequest* request, const char* bytes,
-                                    int bytes_len) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  PluginRequestHandlerProxy* handler =
-      PluginRequestHandlerProxy::FromCPRequest(request);
-  CHECK(handler);
-  handler->AppendDataToUpload(bytes, bytes_len);
-}
-
-CPError STDCALL CPR_AppendFileToUpload(CPRequest* request, const char* filepath,
-                                       uint64 offset, uint64 length) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  PluginRequestHandlerProxy* handler =
-      PluginRequestHandlerProxy::FromCPRequest(request);
-  CHECK(handler);
-
-  if (!length) length = kuint64max;
-  std::wstring wfilepath(UTF8ToWide(filepath));
-  handler->AppendFileRangeToUpload(FilePath::FromWStringHack(wfilepath), offset,
-                                   length);
-  return CPERR_SUCCESS;
-}
-
-int STDCALL CPR_GetResponseInfo(CPRequest* request, CPResponseInfoType type,
-                                void* buf, uint32 buf_size) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  PluginRequestHandlerProxy* handler =
-      PluginRequestHandlerProxy::FromCPRequest(request);
-  CHECK(handler);
-  return handler->GetResponseInfo(type, buf, buf_size);
-}
-
-int STDCALL CPR_Read(CPRequest* request, void* buf, uint32 buf_size) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  PluginRequestHandlerProxy* handler =
-      PluginRequestHandlerProxy::FromCPRequest(request);
-  CHECK(handler);
-  return handler->Read(buf, buf_size);
-}
-
-
-CPBool STDCALL CPB_IsPluginProcessRunning(CPID id) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  return true;
-}
-
-CPProcessType STDCALL CPB_GetProcessType(CPID id) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  return CP_PROCESS_PLUGIN;
-}
-
-CPError STDCALL CPB_SendMessage(CPID id, const void *data, uint32 data_len) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  const uint8* data_ptr = static_cast<const uint8*>(data);
-  std::vector<uint8> v(data_ptr, data_ptr + data_len);
-  if (!PluginThread::current()->Send(new PluginProcessHostMsg_PluginMessage(v)))
-    return CPERR_FAILURE;
-
-  return CPERR_SUCCESS;
-}
-
-CPError STDCALL CPB_SendSyncMessage(CPID id, const void *data, uint32 data_len,
-                                    void **retval, uint32 *retval_len) {
-  CHECK(ChromePluginLib::IsPluginThread());
-  const uint8* data_ptr = static_cast<const uint8*>(data);
-  std::vector<uint8> v(data_ptr, data_ptr + data_len);
-  std::vector<uint8> r;
-  if (!PluginThread::current()->Send(
-          new PluginProcessHostMsg_PluginSyncMessage(v, &r))) {
-    return CPERR_FAILURE;
-  }
-
-  if (r.size()) {
-    *retval_len = static_cast<uint32>(r.size());
-    *retval = CPB_Alloc(*retval_len);
-    memcpy(*retval, &(r.at(0)), r.size());
-  } else {
-    *retval = NULL;
-    *retval_len = 0;
-  }
-
-  return CPERR_SUCCESS;
-}
-
-CPError STDCALL CPB_PluginThreadAsyncCall(CPID id,
-                                          void (*func)(void *),
-                                          void *user_data) {
-  g_plugin_thread_message_loop->PostTask(
-      FROM_HERE, NewRunnableFunction(func, user_data));
-
-  return CPERR_SUCCESS;
-}
-
-CPError STDCALL CPB_OpenFileDialog(CPID id,
-                                   CPBrowsingContext context,
-                                   bool multiple_files,
-                                   const char *title,
-                                   const char *filter,
-                                   void *user_data) {
-  NOTREACHED() <<
-    "Open file dialog should only be called from the renderer process.";
-
-  return CPERR_FAILURE;
-}
-
-}  // namespace
-
-CPBrowserFuncs* GetCPBrowserFuncsForPlugin() {
-  static CPBrowserFuncs browser_funcs;
-  static CPRequestFuncs request_funcs;
-  static CPResponseFuncs response_funcs;
-  static bool initialized = false;
-  if (!initialized) {
-    initialized = true;
-
-    g_plugin_thread_message_loop = PluginThread::current()->message_loop();
-
-    browser_funcs.size = sizeof(browser_funcs);
-    browser_funcs.version = CP_VERSION;
-    browser_funcs.enable_request_intercept = CPB_EnableRequestIntercept;
-    browser_funcs.create_request = CPB_CreateRequest;
-    browser_funcs.get_cookies = CPB_GetCookies;
-    browser_funcs.alloc = CPB_Alloc;
-    browser_funcs.free = CPB_Free;
-    browser_funcs.set_keep_process_alive = CPB_SetKeepProcessAlive;
-    browser_funcs.show_html_dialog = CPB_ShowHtmlDialog;
-    browser_funcs.show_html_dialog_modal = CPB_ShowHtmlDialogModal;
-    browser_funcs.is_plugin_process_running = CPB_IsPluginProcessRunning;
-    browser_funcs.get_process_type = CPB_GetProcessType;
-    browser_funcs.send_message = CPB_SendMessage;
-    browser_funcs.get_browsing_context_from_npp = CPB_GetBrowsingContextFromNPP;
-    browser_funcs.get_browsing_context_info = CPB_GetBrowsingContextInfo;
-    browser_funcs.get_command_line_arguments = CPB_GetCommandLineArguments;
-    browser_funcs.add_ui_command = CPB_AddUICommand;
-    browser_funcs.handle_command = CPB_HandleCommand;
-    browser_funcs.send_sync_message = CPB_SendSyncMessage;
-    browser_funcs.plugin_thread_async_call = CPB_PluginThreadAsyncCall;
-    browser_funcs.open_file_dialog = CPB_OpenFileDialog;
-    browser_funcs.get_drag_data = CPB_GetDragData;
-    browser_funcs.set_drop_effect = CPB_SetDropEffect;
-    browser_funcs.allow_file_drop = CPB_AllowFileDrop;
-
-    browser_funcs.request_funcs = &request_funcs;
-    browser_funcs.response_funcs = &response_funcs;
-
-    request_funcs.size = sizeof(request_funcs);
-    request_funcs.start_request = CPR_StartRequest;
-    request_funcs.end_request = CPR_EndRequest;
-    request_funcs.set_extra_request_headers = CPR_SetExtraRequestHeaders;
-    request_funcs.set_request_load_flags = CPR_SetRequestLoadFlags;
-    request_funcs.append_data_to_upload = CPR_AppendDataToUpload;
-    request_funcs.get_response_info = CPR_GetResponseInfo;
-    request_funcs.read = CPR_Read;
-    request_funcs.append_file_to_upload = CPR_AppendFileToUpload;
-
-    response_funcs.size = sizeof(response_funcs);
-    response_funcs.received_redirect = CPRR_ReceivedRedirect;
-    response_funcs.start_completed = CPRR_StartCompleted;
-    response_funcs.read_completed = CPRR_ReadCompleted;
-    response_funcs.upload_progress = CPRR_UploadProgress;
-  }
-
-  return &browser_funcs;
-}
diff --git a/chrome/plugin/chrome_plugin_host.h b/chrome/plugin/chrome_plugin_host.h
deleted file mode 100644
index 29a0958..0000000
--- a/chrome/plugin/chrome_plugin_host.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2006-2008 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 CHROME_PLUGIN_CHROME_PLUGIN_HOST_H_
-#define CHROME_PLUGIN_CHROME_PLUGIN_HOST_H_
-#pragma once
-
-#include "chrome/common/chrome_plugin_api.h"
-
-// Returns the table of browser functions for use from the plugin process.
-CPBrowserFuncs* GetCPBrowserFuncsForPlugin();
-
-#endif  // CHROME_PLUGIN_CHROME_PLUGIN_HOST_H_
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index cbbb2fb..9d60b0e 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -19,11 +19,9 @@
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
-#include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/plugin/chrome_plugin_host.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/render_thread.h"
 #include "content/common/child_process.h"
@@ -84,8 +82,6 @@ PluginThread::PluginThread()
   // Preload the library to avoid loading, unloading then reloading
   preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
 
-  ChromePluginLib::Create(plugin_path_, GetCPBrowserFuncsForPlugin());
-
   scoped_refptr<webkit::npapi::PluginLib> plugin(
       webkit::npapi::PluginLib::CreatePluginLib(plugin_path_));
   if (plugin.get()) {
@@ -116,7 +112,6 @@ PluginThread::~PluginThread() {
   }
   PluginChannelBase::CleanupChannels();
   webkit::npapi::PluginLib::UnloadAllPlugins();
-  ChromePluginLib::UnloadAllPlugins();
 
   if (webkit_glue::ShouldForcefullyTerminatePluginProcess())
     base::KillProcess(base::GetCurrentProcessHandle(), 0, /* wait= */ false);
@@ -132,7 +127,6 @@ bool PluginThread::OnControlMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PluginThread, msg)
     IPC_MESSAGE_HANDLER(PluginProcessMsg_CreateChannel, OnCreateChannel)
-    IPC_MESSAGE_HANDLER(PluginProcessMsg_PluginMessage, OnPluginMessage)
     IPC_MESSAGE_HANDLER(PluginProcessMsg_NotifyRenderersOfPendingShutdown,
                         OnNotifyRenderersOfPendingShutdown)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -157,20 +151,6 @@ void PluginThread::OnCreateChannel(int renderer_id,
   Send(new PluginProcessHostMsg_ChannelCreated(channel_handle));
 }
 
-void PluginThread::OnPluginMessage(const std::vector<unsigned char> &data) {
-  // We Add/Release ref here to ensure that something will trigger the
-  // shutdown mechanism for processes started in the absence of renderer's
-  // opening a plugin channel.
-  ChildProcess::current()->AddRefProcess();
-  ChromePluginLib *chrome_plugin = ChromePluginLib::Find(plugin_path_);
-  if (chrome_plugin) {
-    void *data_ptr = const_cast<void*>(reinterpret_cast<const void*>(&data[0]));
-    uint32 data_len = static_cast<uint32>(data.size());
-    chrome_plugin->functions().on_message(data_ptr, data_len);
-  }
-  ChildProcess::current()->ReleaseProcess();
-}
-
 void PluginThread::OnNotifyRenderersOfPendingShutdown() {
   PluginChannel::NotifyRenderersOfPendingShutdown();
 }
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index c0919d3..390b2be 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -45,9 +45,6 @@ using webkit::npapi::WebPluginResourceClient;
 using webkit::npapi::WebPluginAcceleratedSurface;
 #endif
 
-typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap;
-static base::LazyInstance<ContextMap> g_context_map(base::LINKER_INITIALIZED);
-
 WebPluginProxy::WebPluginProxy(
     PluginChannel* channel,
     int route_id,
@@ -56,7 +53,6 @@ WebPluginProxy::WebPluginProxy(
     int host_render_view_routing_id)
     : channel_(channel),
       route_id_(route_id),
-      cp_browsing_context_(0),
       window_npobject_(NULL),
       plugin_element_(NULL),
       delegate_(NULL),
@@ -88,9 +84,6 @@ WebPluginProxy::WebPluginProxy(
 }
 
 WebPluginProxy::~WebPluginProxy() {
-  if (cp_browsing_context_)
-    g_context_map.Get().erase(cp_browsing_context_);
-
 #if defined(USE_X11)
   if (windowless_shm_pixmap_ != None)
     XFreePixmap(ui::GetXDisplay(), windowless_shm_pixmap_);
@@ -246,37 +239,10 @@ std::string WebPluginProxy::GetCookies(const GURL& url,
   return cookies;
 }
 
-void WebPluginProxy::ShowModalHTMLDialog(const GURL& url, int width, int height,
-                                         const std::string& json_arguments,
-                                         std::string* json_retval) {
-  PluginHostMsg_ShowModalHTMLDialog* msg =
-      new PluginHostMsg_ShowModalHTMLDialog(
-          route_id_, url, width, height, json_arguments, json_retval);
-
-  // Pump messages while waiting for a response (which won't come until the
-  // dialog is closed).  This avoids a deadlock.
-  msg->EnableMessagePumping();
-  Send(msg);
-}
-
 void WebPluginProxy::OnMissingPluginStatus(int status) {
   Send(new PluginHostMsg_MissingPluginStatus(route_id_, status));
 }
 
-CPBrowsingContext WebPluginProxy::GetCPBrowsingContext() {
-  if (cp_browsing_context_ == 0) {
-    Send(new PluginHostMsg_GetCPBrowsingContext(route_id_,
-                                                &cp_browsing_context_));
-    g_context_map.Get()[cp_browsing_context_] = this;
-  }
-  return cp_browsing_context_;
-}
-
-WebPluginProxy* WebPluginProxy::FromCPBrowsingContext(
-    CPBrowsingContext context) {
-  return g_context_map.Get()[context];
-}
-
 WebPluginResourceClient* WebPluginProxy::GetResourceClient(int id) {
   ResourceClientMap::iterator iterator = resource_clients_.find(id);
   // The IPC messages which deal with streams are now asynchronous. It is
@@ -350,54 +316,6 @@ void WebPluginProxy::HandleURLRequest(const char* url,
   Send(new PluginHostMsg_URLRequest(route_id_, params));
 }
 
-bool WebPluginProxy::GetDragData(struct NPObject* event, bool add_data,
-                                 int32* identity, int32* event_id,
-                                 std::string* type, std::string* data) {
-  DCHECK(event);
-  NPObjectProxy* proxy = NPObjectProxy::GetProxy(event);
-  if (!proxy)  // NPObject* event should have/be a renderer proxy.
-    return false;
-
-  NPVariant_Param event_param;
-  event_param.type = NPVARIANT_PARAM_RECEIVER_OBJECT_ROUTING_ID;
-  event_param.npobject_routing_id = proxy->route_id();
-
-  std::vector<NPVariant_Param> values;
-  bool success = false;
-  Send(new PluginHostMsg_GetDragData(route_id_, event_param, add_data,
-                                     &values, &success));
-  if (!success)
-    return false;
-
-  DCHECK(values.size() == 4);
-  DCHECK(values[0].type == NPVARIANT_PARAM_INT);
-  *identity = static_cast<int32>(values[0].int_value);
-  DCHECK(values[1].type == NPVARIANT_PARAM_INT);
-  *event_id = static_cast<int32>(values[1].int_value);
-  DCHECK(values[2].type == NPVARIANT_PARAM_STRING);
-  type->swap(values[2].string_value);
-  if (add_data && (values[3].type == NPVARIANT_PARAM_STRING))
-    data->swap(values[3].string_value);
-
-  return true;
-}
-
-bool WebPluginProxy::SetDropEffect(struct NPObject* event, int effect) {
-  DCHECK(event);
-  NPObjectProxy* proxy = NPObjectProxy::GetProxy(event);
-  if (!proxy)  // NPObject* event should have/be a renderer proxy.
-    return false;
-
-  NPVariant_Param event_param;
-  event_param.type = NPVARIANT_PARAM_RECEIVER_OBJECT_ROUTING_ID;
-  event_param.npobject_routing_id = proxy->route_id();
-
-  bool success = false;
-  Send(new PluginHostMsg_SetDropEffect(route_id_, event_param, effect,
-                                       &success));
-  return success;
-}
-
 void WebPluginProxy::Paint(const gfx::Rect& rect) {
 #if defined(OS_MACOSX)
   if (!windowless_context_.get())
@@ -737,4 +655,3 @@ void WebPluginProxy::ResourceClientDeleted(
 void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) {
   Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
 }
-
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index acc89ab..4b3f2b4 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -21,7 +21,6 @@
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/timer.h"
-#include "chrome/common/chrome_plugin_api.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 #include "webkit/plugins/npapi/webplugin.h"
@@ -75,28 +74,9 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
   virtual std::string GetCookies(const GURL& url,
                                  const GURL& first_party_for_cookies);
 
-  virtual void ShowModalHTMLDialog(const GURL& url, int width, int height,
-                                   const std::string& json_arguments,
-                                   std::string* json_retval);
-
-  // Called by gears over the CPAPI interface to verify that the given event is
-  // the current (javascript) drag event the browser is dispatching, and return
-  // the drag data, or control the drop effect (drag cursor), if so.
-  bool GetDragData(struct NPObject* event, bool add_data, int32* identity,
-                   int32* event_id, std::string* type, std::string* data);
-  bool SetDropEffect(struct NPObject* event, int effect);
-
   virtual void OnMissingPluginStatus(int status);
   // class-specific methods
 
-  // Retrieves the browsing context associated with the renderer this plugin
-  // is in.  Calling multiple times will return the same value.
-  CPBrowsingContext GetCPBrowsingContext();
-
-  // Retrieves the WebPluginProxy for the given context that was returned by
-  // GetCPBrowsingContext, or NULL if not found.
-  static WebPluginProxy* FromCPBrowsingContext(CPBrowsingContext context);
-
   // Returns a WebPluginResourceClient object given its id, or NULL if no
   // object with that id exists.
   webkit::npapi::WebPluginResourceClient* GetResourceClient(int id);
@@ -203,7 +183,6 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
 
   scoped_refptr<PluginChannel> channel_;
   int route_id_;
-  uint32 cp_browsing_context_;
   NPObject* window_npobject_;
   NPObject* plugin_element_;
   webkit::npapi::WebPluginDelegateImpl* delegate_;