Fix some moved APIs that were left over from PR adobe#10641

Author: peterflynn

src/LiveDevelopment/Servers/FileServer.js

@@ -27,8 +27,8 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var BaseServer  = require("LiveDevelopment/Servers/BaseServer").BaseServer,
-        FileUtils   = require("file/FileUtils");
+    var BaseServer           = require("LiveDevelopment/Servers/BaseServer").BaseServer,
+        LiveDevelopmentUtils = require("LiveDevelopment/LiveDevelopmentUtils");
 
     // The path on Windows starts with a drive letter (e.g. "C:").
     // In order to make it a valid file: URL we need to add an
@@ -61,7 +61,7 @@ define(function (require, exports, module) {
      */
     FileServer.prototype.canServe = function (localPath) {
         // FileServer requires that the base URL is undefined and static HTML files
-        return (!this._baseUrl && FileUtils.isStaticHtmlFileExt(localPath));
+        return (!this._baseUrl && LiveDevelopmentUtils.isStaticHtmlFileExt(localPath));
     };
 
     /**

src/editor/EditorStatusBar.js

@@ -37,9 +37,8 @@ define(function (require, exports, module) {
         AppInit                      = require("utils/AppInit"),
         DropdownButton               = require("widgets/DropdownButton").DropdownButton,
         EditorManager                = require("editor/EditorManager"),
-        MainViewManager     = require("view/MainViewManager"),
+        MainViewManager              = require("view/MainViewManager"),
         Editor                       = require("editor/Editor").Editor,
-        FileUtils                    = require("file/FileUtils"),
         KeyEvent                     = require("utils/KeyEvent"),
         LanguageManager              = require("language/LanguageManager"),
         PreferencesManager           = require("preferences/PreferencesManager"),
@@ -329,7 +328,7 @@ define(function (require, exports, module) {
                 defaultLang = LanguageManager.getLanguageForPath(document.file.fullPath, true);
 
             if (item === LANGUAGE_SET_AS_DEFAULT) {
-                var label = _.escape(StringUtils.format(Strings.STATUSBAR_SET_DEFAULT_LANG, FileUtils.getSmartFileExtension(document.file.fullPath)));
+                var label = _.escape(StringUtils.format(Strings.STATUSBAR_SET_DEFAULT_LANG, LanguageManager.getCompoundFileExtension(document.file.fullPath)));
                 return { html: label, enabled: document.getLanguage() !== defaultLang };
             }
 
@@ -385,7 +384,7 @@ define(function (require, exports, module) {
             if (lang === LANGUAGE_SET_AS_DEFAULT) {
                 // Set file's current language in preferences as a file extension override (only enabled if not default already)
                 var fileExtensionMap = PreferencesManager.get("language.fileExtensions");
-                fileExtensionMap[FileUtils.getSmartFileExtension(fullPath)] = document.getLanguage().getId();
+                fileExtensionMap[LanguageManager.getCompoundFileExtension(fullPath)] = document.getLanguage().getId();
                 PreferencesManager.set("language.fileExtensions", fileExtensionMap);
 
             } else {