Fix to make the log more meaningful when a user script file of an extension cannot be located

LoadScriptContent outputs meaningful log when |path| is empty

BUG=None
TEST=compiles successfully

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

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

chrome/browser/chromeos/login/wizard_accessibility_helper.cc

@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/accessibility_util.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -110,13 +111,7 @@ void WizardAccessibilityHelper::ToggleAccessibility() {
 
 void WizardAccessibilityHelper::SetAccessibilityEnabled(bool enabled) {
   bool doSpeak = (IsAccessibilityEnabled() != enabled);
-  if (g_browser_process) {
-    PrefService* prefService = g_browser_process->local_state();
-    prefService->SetBoolean(prefs::kAccessibilityEnabled, enabled);
-    prefService->ScheduleSavePersistentPrefs();
-  }
-  ExtensionAccessibilityEventRouter::GetInstance()->
-      SetAccessibilityEnabled(enabled);
+  accessibility::EnableAccessibility(enabled, NULL);
   if (doSpeak) {
     accessibility_handler_->Speak(enabled ?
         l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_ACCESS_ENABLED).c_str() :

chrome/browser/extensions/user_script_master.cc

@@ -164,7 +164,13 @@ static bool LoadScriptContent(UserScript::File* script_file) {
   std::string content;
   const FilePath& path = ExtensionResource::GetFilePath(
       script_file->extension_root(), script_file->relative_path());
-  if (path.empty() || !file_util::ReadFileToString(path, &content)) {
+  if (path.empty()) {
+    LOG(WARNING) << "Failed to get file path to "
+                 << script_file->relative_path().value() << " from "
+                 << script_file->extension_root().value();
+    return false;
+  }
+  if (!file_util::ReadFileToString(path, &content)) {
     LOG(WARNING) << "Failed to load user script file: " << path.value();
     return false;
   }