chrome_frame: Use operator!= from scoped_ptr to check if |ver_system| is NULL.

chrome_frame/test/test_with_web_server.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/test/test_with_web_server.h"
 
 #include "base/base_paths.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
@@ skipping 277 matching lines @@
     version = version_info->product_version();
 
   // If we can't find the Chrome Frame DLL in the src tree, we turn to
   // the directory where chrome is installed.
   if (!version_info) {
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     scoped_ptr<Version> ver_system(InstallUtil::GetChromeVersion(dist, true));
     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()));
     cf_dll_path = cf_dll_path.Append(kChromeFrameDllName);
     version_info = FileVersionInfo::CreateFileVersionInfo(cf_dll_path);
     if (version_info)
       version = version_info->product_version();
   }
 
   server_mock().set_expected_result(WideToUTF8(version));
@@ skipping 739 matching lines @@
   server.web_server()->AddResponse(response);
 
   std::wstring url(server.FormatHttpPath(L"form.html"));
 
   ASSERT_TRUE(LaunchBrowser(IE, url.c_str()));
   loop().RunFor(kChromeFrameLongNavigationTimeout);
 
   EXPECT_EQ(1, response->get_request_count());
   EXPECT_EQ(1, response->post_request_count());
 }