summaryrefslogtreecommitdiffstats
path: root/chrome/browser/nacl_host
diff options
context:
space:
mode:
authorjeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 04:18:19 +0000
committerjeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 04:18:19 +0000
commit662a017f24b7a2f8018e2571e9a944d1c8d6ec78 (patch)
tree0956940ae50f3d3cebdd99d577c812ac023366e0 /chrome/browser/nacl_host
parent60073c47d791066042f4ede0d6eb607138a7718c (diff)
downloadchromium_src-662a017f24b7a2f8018e2571e9a944d1c8d6ec78.zip
chromium_src-662a017f24b7a2f8018e2571e9a944d1c8d6ec78.tar.gz
chromium_src-662a017f24b7a2f8018e2571e9a944d1c8d6ec78.tar.bz2
Revert 115246 - [coverity] Fix memory leak.
BUG=none CID=100249 Review URL: http://codereview.chromium.org/9004034 TBR=csilv@chromium.org Review URL: http://codereview.chromium.org/9016004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host')
-rw-r--r--chrome/browser/nacl_host/nacl_process_host.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index c3fd222..eadffc1 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -12,7 +12,6 @@
#include "base/bind.h"
#include "base/command_line.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/path_service.h"
#include "base/stringprintf.h"
@@ -264,8 +263,8 @@ bool NaClProcessHost::LaunchSelLdr() {
if (exe_path.empty())
return false;
- scoped_ptr<CommandLine> cmd_line(new CommandLine(exe_path));
- nacl::CopyNaClCommandLineArguments(cmd_line.get());
+ CommandLine* cmd_line = new CommandLine(exe_path);
+ nacl::CopyNaClCommandLineArguments(cmd_line);
cmd_line->AppendSwitchASCII(switches::kProcessType,
switches::kNaClLoaderProcess);
@@ -282,12 +281,12 @@ bool NaClProcessHost::LaunchSelLdr() {
return NaClBrokerService::GetInstance()->LaunchLoader(
this, ASCIIToWide(channel_id));
} else {
- BrowserChildProcessHost::Launch(FilePath(), cmd_line.get());
+ BrowserChildProcessHost::Launch(FilePath(), cmd_line);
}
#elif defined(OS_POSIX)
BrowserChildProcessHost::Launch(nacl_loader_prefix.empty(), // use_zygote
base::environment_vector(),
- cmd_line.get());
+ cmd_line);
#endif
return true;