diff options
| author | vkuzkokov@chromium.org <vkuzkokov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 12:19:45 +0000 |
|---|---|---|
| committer | vkuzkokov@chromium.org <vkuzkokov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 12:19:45 +0000 |
| commit | c07e99f0737a6fae5be251f4f0fe61a459b2e163 (patch) | |
| tree | 0126cccbfc3836e7b2ddd14e2a10607dbf9c9b40 | |
| parent | 14eee11a95ebb3333571f7e4b40cb8b47d409a36 (diff) | |
| download | chromium_src-c07e99f0737a6fae5be251f4f0fe61a459b2e163.zip chromium_src-c07e99f0737a6fae5be251f4f0fe61a459b2e163.tar.gz chromium_src-c07e99f0737a6fae5be251f4f0fe61a459b2e163.tar.bz2 | |
DevTools: fixed test ExtensionApiTest.Debugger
BUG=380082,234166
TBR=finnur
Review URL: https://codereview.chromium.org/333223003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277740 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/api/debugger/debugger_apitest.cc | 10 | ||||
| -rw-r--r-- | chrome/test/data/extensions/api_test/debugger/background.js | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/extensions/api/debugger/debugger_apitest.cc b/chrome/browser/extensions/api/debugger/debugger_apitest.cc index 8b9023f..878135a 100644 --- a/chrome/browser/extensions/api/debugger/debugger_apitest.cc +++ b/chrome/browser/extensions/api/debugger/debugger_apitest.cc @@ -6,14 +6,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h" -// Debugger is flaky on browser_tests on Windows, Linux, and Chrome OS: -// crbug.com/234166. -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -#define MAYBE(x) DISABLED_##x -#else -#define MAYBE(x) x -#endif - -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE(Debugger)) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Debugger) { ASSERT_TRUE(RunExtensionTest("debugger")) << message_; } diff --git a/chrome/test/data/extensions/api_test/debugger/background.js b/chrome/test/data/extensions/api_test/debugger/background.js index 9a7f46c..a6e2e8d 100644 --- a/chrome/test/data/extensions/api_test/debugger/background.js +++ b/chrome/test/data/extensions/api_test/debugger/background.js @@ -140,7 +140,9 @@ chrome.test.runTests([ }, function createAndDiscoverTab() { - function onUpdated(tabId) { + function onUpdated(tabId, changeInfo) { + if (changeInfo.status == 'loading') + return; chrome.tabs.onUpdated.removeListener(onUpdated); chrome.debugger.getTargets(function(targets) { var page = targets.filter( |