DevTools: repair on linux and reenable breakpoint tests

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

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

1 files changed, 6 insertions, 2 deletions

diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js
index 8fced0b..7c241ad 100644
--- a/webkit/glue/devtools/js/tests.js
+++ b/webkit/glue/devtools/js/tests.js
@@ -520,7 +520,10 @@ TestSuite.prototype.showMainPageScriptSource_ = function(scriptName, callback) {
       'Unexpected number of scripts(' + test.optionsToString_(options) + ')');
 
   // Select page's script if it's not current option.
-  if (options[scriptSelect.selectedIndex].text !== scriptName) {
+  var scriptResource;
+  if (options[scriptSelect.selectedIndex].text === scriptName) {
+    scriptResource = options[scriptSelect.selectedIndex].representedObject;
+  } else {
     var pageScriptIndex = -1;
     for (var i = 0; i < options.length; i++) {
       if (options[i].text === scriptName) {
@@ -531,12 +534,13 @@ TestSuite.prototype.showMainPageScriptSource_ = function(scriptName, callback) {
     test.assertTrue(-1 !== pageScriptIndex,
                     'Script with url ' + scriptName + ' not found among ' +
                         test.optionsToString_(options));
+    scriptResource = options[pageScriptIndex].representedObject;
+
     // Current panel is 'Scripts'.
     WebInspector.currentPanel._showScriptOrResource(scriptResource);
     test.assertEquals(pageScriptIndex, scriptSelect.selectedIndex,
                       'Unexpected selected option index.');
   }
-  var scriptResource = options[scriptSelect.selectedIndex].representedObject;
 
   test.assertTrue(scriptResource instanceof WebInspector.Resource,
                   'Unexpected resource class.');