diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 13:41:44 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 13:41:44 +0000 |
| commit | ff79e4cb04e786dae8c5ea3d1398b72af634718e (patch) | |
| tree | 62e359fc927fee850ccc5ab03eccc62c29108bae /chrome_frame/test/test_with_web_server.cc | |
| parent | 2b95d7bddd7df783524c532cc29e3a84803da94b (diff) | |
| download | chromium_src-ff79e4cb04e786dae8c5ea3d1398b72af634718e.zip chromium_src-ff79e4cb04e786dae8c5ea3d1398b72af634718e.tar.gz chromium_src-ff79e4cb04e786dae8c5ea3d1398b72af634718e.tar.bz2 | |
chrome_frame: Use operator!= from scoped_ptr to check if |ver_system| is NULL.
The pattern get() ? true : false isn't widely used and after this patch has no
more occurrences across chromium/src/ codebase.
R=tommi@chromium.org
Review URL: http://codereview.chromium.org/10262014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/test_with_web_server.cc')
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index ca84ec6..7a668db 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -295,7 +295,7 @@ void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser, scoped_ptr<Version> ver_user(InstallUtil::GetChromeVersion(dist, false)); ASSERT_TRUE(ver_system.get() || ver_user.get()); - bool system_install = ver_system.get() ? true : false; + bool system_install = ver_system != NULL; FilePath cf_dll_path(installer::GetChromeInstallPath(system_install, dist)); cf_dll_path = cf_dll_path.Append(UTF8ToWide( ver_system.get() ? ver_system->GetString() : ver_user->GetString())); |