[Coverity] Fix dereference null check errors.
Modified code to check the return value of base::FieldTrialList::Find() function.
CID=105943
BUG=none
TEST=
[email protected]
Review URL: https://chromiumcodereview.appspot.com/11035021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160224 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc
index 77971282..03ce609 100644
--- a/chrome/browser/extensions/default_apps.cc
+++ b/chrome/browser/extensions/default_apps.cc
@@ -115,27 +115,24 @@
NOTREACHED();
}
- if (install_apps && !IsLocaleSupported()) {
+ if (install_apps && !IsLocaleSupported())
install_apps = false;
- }
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableDefaultApps)) {
install_apps = false;
}
- if (base::FieldTrialList::TrialExists(kDefaultAppsTrialName)) {
- install_apps = base::FieldTrialList::Find(
- kDefaultAppsTrialName)->group_name() != kDefaultAppsTrialNoAppsGroup;
- }
+ base::FieldTrial* trial = base::FieldTrialList::Find(kDefaultAppsTrialName);
+ if (trial)
+ install_apps = trial->group_name() != kDefaultAppsTrialNoAppsGroup;
// Default apps are only installed on profile creation or a new chrome
// download.
if (state == kUnknown) {
if (install_apps) {
- profile_->GetPrefs()->SetInteger(
- prefs::kDefaultAppsInstallState,
- kAlreadyInstalledDefaultApps);
+ profile_->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
+ kAlreadyInstalledDefaultApps);
} else {
profile_->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
kNeverInstallDefaultApps);
