Revert 24094, caused a build break.

TBR=mnaganov
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/174319

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

3 files changed, 38 insertions, 12 deletions

diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index e8e63ca..830895e 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -153,8 +153,26 @@ var context = {};  // Used by WebCore's inspector routines.
 ///////////////////////////////////////////////////////////////////////////////
 // Here and below are overrides to existing WebInspector methods only.
 // TODO(pfeldman): Patch WebCore and upstream changes.
+(function () {
+
 var oldLoaded = WebInspector.loaded;
-WebInspector.loaded = function() {
+
+function loadDevToolsStrings() {
+  var locale = DevToolsHost.getApplicationLocale();
+  locale = locale.replace('_', '-');
+
+  var devtoolsStringsScriptElement = document.createElement('script');
+  devtoolsStringsScriptElement.addEventListener(
+      "load",
+      devToolsHandleLoaded.bind(WebInspector),
+      false);
+  devtoolsStringsScriptElement.type = 'text/javascript';
+  devtoolsStringsScriptElement.src = 'l10n/devtoolsStrings_' + locale + '.js';
+  document.getElementsByTagName("head").item(0).appendChild(
+      devtoolsStringsScriptElement);
+};
+
+function devToolsHandleLoaded() {
   devtools.tools = new devtools.ToolsAgent();
   devtools.tools.reset();
 
@@ -180,6 +198,17 @@ WebInspector.loaded = function() {
   DevToolsHost.loaded();
 };
 
+// l10n is turned off in tests mode because delayed loading of strings
+// causes test failures.
+if (!window.___interactiveUiTestsMode) {
+  window.localizedStrings = {};
+  WebInspector.loaded = loadDevToolsStrings;
+} else {
+  WebInspector.loaded = devToolsHandleLoaded;
+}
+
+})();
+
 
 var webkitUpdateChildren =
     WebInspector.ElementsTreeElement.prototype.updateChildren;
@@ -533,15 +562,6 @@ WebInspector.ScriptsPanel.prototype.doEvalInCallFrame =
 })();
 
 
-/*
- * @override	
- * TODO(mnaganov): Restore l10n when it will be agreed that it is needed.	
- */	
-WebInspector.UIString = function(string) {	
-  return String.vsprintf(string, Array.prototype.slice.call(arguments, 1));	
-};
-
-
 // There is no clear way of setting frame title yet. So sniffing main resource
 // load.
 (function OverrideUpdateResource() {
diff --git a/webkit/glue/devtools/js/devtools_host_stub.js b/webkit/glue/devtools/js/devtools_host_stub.js
index 7365bea..5142bbe 100644
--- a/webkit/glue/devtools/js/devtools_host_stub.js
+++ b/webkit/glue/devtools/js/devtools_host_stub.js
@@ -255,6 +255,11 @@ RemoteDebuggerCommandExecutorStub.prototype.sendResponse_ = function(response) {
  */
 DevToolsHostStub = function() {
   this.isStub = true;
+  window.domAutomationController = {
+    send: function(text) {
+        debugPrint(text);
+    }
+  };
 };
 
 
@@ -289,6 +294,7 @@ function addDummyResource() {
 
 DevToolsHostStub.prototype.loaded = function() {
   addDummyResource();
+  uiTests.runAllTests();
 };
 
 
diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js
index 53ee61f..a3b6d98 100644
--- a/webkit/glue/devtools/js/inspector_controller_impl.js
+++ b/webkit/glue/devtools/js/inspector_controller_impl.js
@@ -109,10 +109,10 @@ devtools.InspectorControllerImpl.prototype.toggleNodeSearch = function() {
 devtools.InspectorControllerImpl.prototype.localizedStringsURL = function() {
   // l10n is turned off in test mode because delayed loading of strings
   // causes test failures.
-  if (false) {
+  if (!window.___interactiveUiTestsMode) {
     var locale = DevToolsHost.getApplicationLocale();
     locale = locale.replace('_', '-');
-    return 'l10n/localizedStrings_' + locale + '.js';
+    return 'l10n/inspectorStrings_' + locale + '.js';
   } else {
     return undefined;
   }