Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / file_manager / gallery / js / background.js

diff --git a/src/ui/file_manager/gallery/js/background.js b/src/ui/file_manager/gallery/js/background.js
index 8b2b8c3..0b51c04 100644 (file)
--- a/src/ui/file_manager/gallery/js/background.js
+++ b/src/ui/file_manager/gallery/js/background.js
@@ -30,7 +30,7 @@ function BackgroundComponents(stringData, volumeManager) {
  */
 BackgroundComponents.load = function() {
   var stringDataPromise = new Promise(function(fulfill) {
-    chrome.fileBrowserPrivate.getStrings(function(stringData) {
+    chrome.fileManagerPrivate.getStrings(function(stringData) {
       loadTimeData.data = stringData;
       fulfill(stringData);
     });
@@ -62,13 +62,13 @@ var backgroundComponentsPromise = BackgroundComponents.load();
  */
 function resolveEntries(entries) {
   return new Promise(function(fulfill, reject) {
-    chrome.fileBrowserPrivate.resolveIsolatedEntries(entries,
-                                                     function(externalEntries) {
-      if (!chrome.runtime.lastError)
-        fulfill(externalEntries);
-      else
-        reject(chrome.runtime.lastError);
-    });
+    chrome.fileManagerPrivate.resolveIsolatedEntries(
+        entries, function(externalEntries) {
+          if (!chrome.runtime.lastError)
+            fulfill(externalEntries);
+          else
+            reject(chrome.runtime.lastError);
+        });
   });
 }
 
@@ -203,13 +203,15 @@ chrome.app.runtime.onLaunched.addListener(function(launchData) {
 // If is is run in the browser test, wait for the test resources are installed
 // as a component extension, and then load the test resources.
 if (chrome.test) {
+  /** @type {string} */
+  window.testExtensionId = 'ejhcmmdhhpdhhgmifplfmjobgegbibkn';
   chrome.runtime.onMessageExternal.addListener(function(message) {
     if (message.name !== 'testResourceLoaded')
       return;
     var script = document.createElement('script');
     script.src =
-        'chrome-extension://ejhcmmdhhpdhhgmifplfmjobgegbibkn' +
-        '/gallery/test_loader.js';
+        'chrome-extension://' + window.testExtensionId +
+        '/common/test_loader.js';
     document.documentElement.appendChild(script);
   });
 }