diff options
author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 02:06:01 +0000 |
---|---|---|
committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 02:06:01 +0000 |
commit | d5b2197037aac358c1ac7c747e2761e1562a584b (patch) | |
tree | 8e9f448966eb4215d77a65da0865503530498761 /chrome/browser/automation | |
parent | af2f56c8ee88d09483ef83792f9b9a31f4f08f79 (diff) | |
download | chromium_src-d5b2197037aac358c1ac7c747e2761e1562a584b.zip chromium_src-d5b2197037aac358c1ac7c747e2761e1562a584b.tar.gz chromium_src-d5b2197037aac358c1ac7c747e2761e1562a584b.tar.bz2 |
Revert 147594 - NaCl: Remove two uses of '#include "nacl/nacl_log.h"'
"git cl dcommit" went crazy and appears to have reverted the 3
previous commits at the same time as committing my change. (This
might be due to race conditions with running "git fetch"
concurrently.)
TBR=mseaborn@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10815024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 2dcee1a..deb355f 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -1152,7 +1152,7 @@ void TestingAutomationProvider::GetDownloadDirectory( DownloadManager* dlm = BrowserContext::GetDownloadManager(tab->GetBrowserContext()); *download_directory = - DownloadPrefs::FromDownloadManager(dlm)->download_path(); + DownloadPrefs::FromDownloadManager(dlm)->DownloadPath(); } } |