diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-20 07:15:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-20 07:15:17 +0000 |
| commit | ea51de3307a6a5947ca047fa9d0e20359fdcf658 (patch) | |
| tree | c1a49c1d41c4bfbf74ddbc28c371f840dd2848fa /chrome/browser/renderer_host | |
| parent | b6aedfff89cd93f07c1c38a13062801e81bf26e4 (diff) | |
| download | chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.zip chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.tar.gz chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.tar.bz2 | |
Reverting 10080.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index fc3bdfd..d17ab83 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -18,7 +18,6 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/rand_util.h" -#include "base/scoped_ptr.h" #include "base/shared_memory.h" #include "base/singleton.h" #include "base/string_util.h" @@ -84,7 +83,8 @@ class RendererMainThread : public base::Thread { CoInitialize(NULL); #endif - render_process_.reset(new RenderProcess(channel_id_)); + bool rv = RenderProcess::GlobalInit(channel_id_); + DCHECK(rv); // It's a little lame to manually set this flag. But the single process // RendererThread will receive the WM_QUIT. We don't need to assert on // this thread, so just force the flag manually. @@ -94,7 +94,7 @@ class RendererMainThread : public base::Thread { } virtual void CleanUp() { - render_process_.reset(); + RenderProcess::GlobalCleanup(); #if defined(OS_WIN) CoUninitialize(); @@ -103,7 +103,6 @@ class RendererMainThread : public base::Thread { private: std::wstring channel_id_; - scoped_ptr<RenderProcess> render_process_; }; // Used for a View_ID where the renderer has not been attached yet |