From 98d0dd758970c311cd7f4f05dd7760686754e916 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Mon, 20 Sep 2010 22:53:09 +0000 Subject: Reduce console spam from master_preferences. It's ok (and common) for master preferences to not exist. TEST=compiles Review URL: http://codereview.chromium.org/3413022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59984 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/util/master_preferences.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'chrome/installer/util/master_preferences.cc') diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc index e2c0c80..2e037d0 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -165,11 +165,9 @@ DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line) { DictionaryValue* ParseDistributionPreferences( const FilePath& master_prefs_path) { - if (!file_util::PathExists(master_prefs_path)) { - LOG(WARNING) << "Master preferences file not found: " - << master_prefs_path.value(); + if (!file_util::PathExists(master_prefs_path)) return NULL; - } + std::string json_data; if (!file_util::ReadFileToString(master_prefs_path, &json_data)) { LOG(WARNING) << "Failed to read master prefs file."; -- cgit v1.1