Coverity: Fix various NULL_RETURNS defects.

CID=8699, 13592, 14444, 14510, 14658, 14805, 14897
BUG=none
Review URL: http://codereview.chromium.org/6672016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77845 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index b48945b..9200d5d 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -176,9 +176,10 @@ void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) {
     local_state->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
     DCHECK(user_prefs->FindPreference(prefs::kBrowserWindowPlacement));
     if (local_state->HasPrefPath(prefs::kBrowserWindowPlacement)) {
-      user_prefs->Set(prefs::kBrowserWindowPlacement,
-          *(local_state->FindPreference(prefs::kBrowserWindowPlacement)->
-              GetValue()));
+      const PrefService::Preference* pref =
+          local_state->FindPreference(prefs::kBrowserWindowPlacement);
+      DCHECK(pref);
+      user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
     }
     local_state->ClearPref(prefs::kBrowserWindowPlacement);
 
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index 7c17a6f..5afb08f 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -377,7 +377,10 @@ DictionaryValue* PrefService::GetPreferenceValues() const {
   DictionaryValue* out = new DictionaryValue;
   DefaultPrefStore::const_iterator i = default_store_->begin();
   for (; i != default_store_->end(); ++i) {
-    const Value* value = FindPreference(i->first.c_str())->GetValue();
+    const Preference* pref = FindPreference(i->first.c_str());
+    DCHECK(pref);
+    const Value* value = pref->GetValue();
+    DCHECK(value);
     out->Set(i->first, value->DeepCopy());
   }
   return out;