Handles path absence instead of CHECKing.

In Chromium OS there is no 'extensions' directory, so this case should
be handled correctly.

BUG=chromium-os:11107,70197
TEST=login to CrOS, no crashing

Review URL: http://codereview.chromium.org/6265014

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

1 files changed, 12 insertions, 9 deletions

diff --git a/chrome/browser/extensions/external_pref_extension_loader.cc b/chrome/browser/extensions/external_pref_extension_loader.cc
index fc84b1e..0d246b0 100644
--- a/chrome/browser/extensions/external_pref_extension_loader.cc
+++ b/chrome/browser/extensions/external_pref_extension_loader.cc
@@ -60,19 +60,22 @@ void ExternalPrefExtensionLoader::StartLoading() {
 void ExternalPrefExtensionLoader::LoadOnFileThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  CHECK(PathService::Get(base_path_key_, &base_path_));
+  scoped_ptr<DictionaryValue> prefs;
 
-  FilePath json_file;
-  json_file = base_path_.Append(FILE_PATH_LITERAL("external_extensions.json"));
+  if (PathService::Get(base_path_key_, &base_path_)) {
+    FilePath json_file;
+    json_file =
+        base_path_.Append(FILE_PATH_LITERAL("external_extensions.json"));
 
-  scoped_ptr<DictionaryValue> prefs;
-  if (file_util::PathExists(json_file)) {
-    JSONFileValueSerializer serializer(json_file);
-    prefs.reset(ExtractPrefs(&serializer));
-  } else {
-    prefs.reset(new DictionaryValue());
+    if (file_util::PathExists(json_file)) {
+      JSONFileValueSerializer serializer(json_file);
+      prefs.reset(ExtractPrefs(&serializer));
+    }
   }
 
+  if (!prefs.get())
+    prefs.reset(new DictionaryValue());
+
   prefs_.reset(prefs.release());
   BrowserThread::PostTask(
        BrowserThread::UI, FROM_HERE,