Commit 4b835120 authored by mnaganov@chromium.org's avatar mnaganov@chromium.org

DevTools: A quick fix to enable interactive_ui_tests.

Need to figure out why settings are inavailable through InspectorController.
For now, just stub them.

BUG=http://crbug.com/21277
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25711 0039d316-1c4b-4281-b951-d872f2087c98
parent 28062949
...@@ -125,39 +125,39 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestHostIsPresent) { ...@@ -125,39 +125,39 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestHostIsPresent) {
} }
// Tests elements panel basics. // Tests elements panel basics.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestElementsTreeRoot) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestElementsTreeRoot) {
RunTest("testElementsTreeRoot", kSimplePage); RunTest("testElementsTreeRoot", kSimplePage);
} }
// Tests main resource load. // Tests main resource load.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestMainResource) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestMainResource) {
RunTest("testMainResource", kSimplePage); RunTest("testMainResource", kSimplePage);
} }
// Tests resources panel enabling. // Tests resources panel enabling.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestEnableResourcesTab) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEnableResourcesTab) {
RunTest("testEnableResourcesTab", kSimplePage); RunTest("testEnableResourcesTab", kSimplePage);
} }
// Tests resource headers. // Tests resource headers.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestResourceHeaders) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestResourceHeaders) {
RunTest("testResourceHeaders", kResourceTestPage); RunTest("testResourceHeaders", kResourceTestPage);
} }
// Tests profiler panel. // Tests profiler panel.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestProfilerTab) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestProfilerTab) {
RunTest("testProfilerTab", kJsPage); RunTest("testProfilerTab", kJsPage);
} }
// Tests scripts panel showing. // Tests scripts panel showing.
// http://crbug.com/16767 // http://crbug.com/16767
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestShowScriptsTab) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) {
RunTest("testShowScriptsTab", kDebuggerTestPage); RunTest("testShowScriptsTab", kDebuggerTestPage);
} }
// Tests set breakpoint. // Tests set breakpoint.
// http://crbug.com/16767 // http://crbug.com/16767
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestSetBreakpoint) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestSetBreakpoint) {
RunTest("testSetBreakpoint", kDebuggerTestPage); RunTest("testSetBreakpoint", kDebuggerTestPage);
} }
...@@ -167,17 +167,17 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestPauseInEval) { ...@@ -167,17 +167,17 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestPauseInEval) {
} }
// Tests console eval. // Tests console eval.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestConsoleEval) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleEval) {
RunTest("testConsoleEval", kConsoleTestPage); RunTest("testConsoleEval", kConsoleTestPage);
} }
// Tests console log. // Tests console log.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestConsoleLog) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleLog) {
RunTest("testConsoleLog", kConsoleTestPage); RunTest("testConsoleLog", kConsoleTestPage);
} }
// Tests eval global values. // Tests eval global values.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestEvalGlobal) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEvalGlobal) {
RunTest("testEvalGlobal", kEvalTestPage); RunTest("testEvalGlobal", kEvalTestPage);
} }
......
...@@ -51,6 +51,11 @@ devtools.InspectorController = function() { ...@@ -51,6 +51,11 @@ devtools.InspectorController = function() {
* @type {boolean} * @type {boolean}
*/ */
this.timelineEnabled_ = false; this.timelineEnabled_ = false;
/**
* @type {Object}
*/
this.settings_ = {};
}; };
...@@ -479,4 +484,23 @@ devtools.InspectorController.prototype.stepOverStatementInDebugger = ...@@ -479,4 +484,23 @@ devtools.InspectorController.prototype.stepOverStatementInDebugger =
function() { function() {
}; };
/**
* Sets a setting value in backend.
*/
devtools.InspectorController.prototype.setSetting =
function(setting, value) {
this.settings_[setting] = value;
};
/**
* Retrieves a setting value stored in backend.
*/
devtools.InspectorController.prototype.setting =
function(setting) {
return this.settings_[setting];
};
var InspectorController = new devtools.InspectorController(); var InspectorController = new devtools.InspectorController();
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment