diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 18:07:03 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 18:07:03 +0000 |
| commit | ab2459f941a08164dbbf577a2ed547e187f357e0 (patch) | |
| tree | fdbde6162f238b75ac6e94d52b57adeadac15a14 /chrome_frame | |
| parent | 1d235e1125ced9babaf211f1f7e93029a0a9cee4 (diff) | |
| download | chromium_src-ab2459f941a08164dbbf577a2ed547e187f357e0.zip chromium_src-ab2459f941a08164dbbf577a2ed547e187f357e0.tar.gz chromium_src-ab2459f941a08164dbbf577a2ed547e187f357e0.tar.bz2 | |
Fix one more instance of scoped_ptr<T>(NULL) on Windows.
Not sure why I missed this the first time.
BUG=173286
R=robertshield@chromium.org
Review URL: https://codereview.chromium.org/17911004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/automation_client_mock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h index a2660b7..cbbbc5a 100644 --- a/chrome_frame/test/automation_client_mock.h +++ b/chrome_frame/test/automation_client_mock.h @@ -169,7 +169,7 @@ class CFACMockTest : public testing::Test { protected: CFACMockTest() - : tracker_(NULL), timeout_(500), + : timeout_(500), returned_proxy_(static_cast<ChromeFrameAutomationProxy*>(&mock_proxy_)) { GetChromeFrameProfilePath(L"Adam.N.Epilinter", &profile_path_); id_ = reinterpret_cast<void*>(5); |