diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-30 09:25:03 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-30 09:25:03 +0000 |
| commit | 29db6cd04107bd64205ebfaf91107fdb686b650d (patch) | |
| tree | 97898d0827f899065310342b2b2c5518f4891e88 | |
| parent | 161722a6f00347cb616d86dd25cc1273ae0f2675 (diff) | |
| download | chromium_src-29db6cd04107bd64205ebfaf91107fdb686b650d.zip chromium_src-29db6cd04107bd64205ebfaf91107fdb686b650d.tar.gz chromium_src-29db6cd04107bd64205ebfaf91107fdb686b650d.tar.bz2 | |
Revert 94581 - Fix possible memory problems in the ProxyLauncher
... introduced by my earlier change. It seems that
someone tries to access AutomationProxy after
DisconnectFromRunningBrowser destroys it, and the entire thing crashes.
BUG=90489,91023
Review URL: http://codereview.chromium.org/7533006
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/7488070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94835 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/automation/proxy_launcher.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc index df9b847..678f49d 100644 --- a/chrome/test/automation/proxy_launcher.cc +++ b/chrome/test/automation/proxy_launcher.cc @@ -154,8 +154,7 @@ void ProxyLauncher::CloseBrowserAndServer() { } void ProxyLauncher::DisconnectFromRunningBrowser() { - if (automation_proxy_.get()) - automation_proxy_->Disconnect(); + automation_proxy_.reset(); } bool ProxyLauncher::LaunchBrowser(const LaunchState& state) { |