Refactor code from RenderThread and PluginThread and move it to ChildThread. ChildProcess now owns the ChildThread, which removes duplicate code and simplifies things.

Clean up ChildProcess, there really was no need for all the templates and statics in it and its subclasses.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10080
Review URL: http://codereview.chromium.org/21502

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

1 files changed, 19 insertions, 29 deletions

diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index a65f326..7ccf018 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -134,14 +134,14 @@ ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() {
 
 #if defined(OS_WIN)
   if (shared_buf_) {
-    g_render_thread->Send(
+    RenderThread::current()->Send(
         new ViewHostMsg_ClipboardWriteObjectsSync(objects_));
     delete shared_buf_;
     return;
   }
 #endif
 
-  g_render_thread->Send(
+  RenderThread::current()->Send(
       new ViewHostMsg_ClipboardWriteObjectsAsync(objects_));
 }
 
@@ -183,7 +183,7 @@ bool GetMimeTypeFromExtension(const FilePath::StringType &ext,
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
   DCHECK(mime_type->empty());
-  g_render_thread->Send(
+  RenderThread::current()->Send(
       new ViewHostMsg_GetMimeTypeFromExtension(ext, mime_type));
   return !mime_type->empty();
 }
@@ -196,7 +196,7 @@ bool GetMimeTypeFromFile(const FilePath &file_path,
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
   DCHECK(mime_type->empty());
-  g_render_thread->Send(
+  RenderThread::current()->Send(
       new ViewHostMsg_GetMimeTypeFromFile(file_path, mime_type));
   return !mime_type->empty();
 }
@@ -209,7 +209,7 @@ bool GetPreferredExtensionForMimeType(const std::string& mime_type,
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
   DCHECK(ext->empty());
-  g_render_thread->Send(
+  RenderThread::current()->Send(
       new ViewHostMsg_GetPreferredExtensionForMimeType(mime_type, ext));
   return !ext->empty();
 }
@@ -246,21 +246,21 @@ bool ClipboardIsFormatAvailable(Clipboard::FormatType format) {
 
 bool ClipboardIsFormatAvailable(unsigned int format) {
   bool result;
-  g_render_thread->Send(
+  RenderThread::current()->Send(
       new ViewHostMsg_ClipboardIsFormatAvailable(format, &result));
   return result;
 }
 
 void ClipboardReadText(std::wstring* result) {
-  g_render_thread->Send(new ViewHostMsg_ClipboardReadText(result));
+  RenderThread::current()->Send(new ViewHostMsg_ClipboardReadText(result));
 }
 
 void ClipboardReadAsciiText(std::string* result) {
-  g_render_thread->Send(new ViewHostMsg_ClipboardReadAsciiText(result));
+  RenderThread::current()->Send(new ViewHostMsg_ClipboardReadAsciiText(result));
 }
 
 void ClipboardReadHTML(std::wstring* markup, GURL* url) {
-  g_render_thread->Send(new ViewHostMsg_ClipboardReadHTML(markup, url));
+  RenderThread::current()->Send(new ViewHostMsg_ClipboardReadHTML(markup, url));
 }
 
 GURL GetInspectorURL() {
@@ -271,9 +271,8 @@ std::string GetUIResourceProtocol() {
   return "chrome";
 }
 
-bool GetPlugins(bool refresh,
-                             std::vector<WebPluginInfo>* plugins) {
-  return g_render_thread->Send(
+bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
+  return RenderThread::current()->Send(
       new ViewHostMsg_GetPlugins(refresh, plugins));
 }
 
@@ -281,33 +280,24 @@ bool GetPlugins(bool refresh,
 bool EnsureFontLoaded(HFONT font) {
   LOGFONT logfont;
   GetObject(font, sizeof(LOGFONT), &logfont);
-  return g_render_thread->Send(new ViewHostMsg_LoadFont(logfont));
+  return RenderThread::current()->Send(new ViewHostMsg_LoadFont(logfont));
 }
 #endif
 
 webkit_glue::ScreenInfo GetScreenInfo(gfx::NativeViewId window) {
   webkit_glue::ScreenInfo results;
-  g_render_thread->Send(
+  RenderThread::current()->Send(
       new ViewHostMsg_GetScreenInfo(window, &results));
   return results;
 }
 
 uint64 VisitedLinkHash(const char* canonical_url, size_t length) {
-  return g_render_thread->visited_link_slave()->ComputeURLFingerprint(
+  return RenderThread::current()->visited_link_slave()->ComputeURLFingerprint(
       canonical_url, length);
 }
 
 bool IsLinkVisited(uint64 link_hash) {
-  return g_render_thread->visited_link_slave()->IsVisited(link_hash);
-}
-
-int ResolveProxyFromRenderThread(const GURL& url, std::string* proxy_result) {
-  // Send a synchronous IPC from renderer process to the browser process to
-  // resolve the proxy. (includes --single-process case).
-  int net_error;
-  bool ipc_ok = g_render_thread->Send(
-      new ViewHostMsg_ResolveProxy(url, &net_error, proxy_result));
-  return ipc_ok ? net_error : net::ERR_UNEXPECTED;
+  return RenderThread::current()->visited_link_slave()->IsVisited(link_hash);
 }
 
 #ifndef USING_SIMPLE_RESOURCE_LOADER_BRIDGE
@@ -354,12 +344,12 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create(
 
 void SetCookie(const GURL& url, const GURL& policy_url,
                const std::string& cookie) {
-  g_render_thread->Send(new ViewHostMsg_SetCookie(url, policy_url, cookie));
+  RenderThread::current()->Send(new ViewHostMsg_SetCookie(url, policy_url, cookie));
 }
 
 std::string GetCookies(const GURL& url, const GURL& policy_url) {
   std::string cookies;
-  g_render_thread->Send(new ViewHostMsg_GetCookies(url, policy_url, &cookies));
+  RenderThread::current()->Send(new ViewHostMsg_GetCookies(url, policy_url, &cookies));
   return cookies;
 }
 
@@ -367,8 +357,8 @@ void NotifyCacheStats() {
   // Update the browser about our cache
   // NOTE: Since this can be called from the plugin process, we might not have
   // a RenderThread.  Do nothing in that case.
-  if (g_render_thread)
-    g_render_thread->InformHostOfCacheStatsLater();
+  if (!IsPluginProcess())
+    RenderThread::current()->InformHostOfCacheStatsLater();
 }
 
 #endif  // !USING_SIMPLE_RESOURCE_LOADER_BRIDGE