From 9e0be75c8f409cf25db4380615fc4a9a8bdaeb13 Mon Sep 17 00:00:00 2001 From: "dtseng@chromium.org" Date: Tue, 17 Jun 2014 02:15:16 +0000 Subject: [PATCH] Only run ChromeVox2 tests when 'use_chromevox_next'==1. TBR=phajdan.jr@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/332223004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277621 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi | 7 +++++-- chrome/test/base/extension_js_browser_test.cc | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi index 3650af7a6e92..92f1642f57e5 100644 --- a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi +++ b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi @@ -127,8 +127,11 @@ 'common/key_sequence_test.js', 'common/math_semantic_tree_test.js', 'common/selection_util_test.js', - - '../chromevox2/cvox2/background/background.extjs', + ], + 'conditions': [ + ['use_chromevox_next==1', { + 'sources': ['../chromevox2/cvox2/background/background.extjs'], + }], ], }, # target chromevox_tests { diff --git a/chrome/test/base/extension_js_browser_test.cc b/chrome/test/base/extension_js_browser_test.cc index 91a381d2d3af..36e78c90dc9e 100644 --- a/chrome/test/base/extension_js_browser_test.cc +++ b/chrome/test/base/extension_js_browser_test.cc @@ -24,7 +24,7 @@ bool ExtensionJSBrowserTest::RunJavascriptTestF(bool is_async, const std::string& test_fixture, const std::string& test_name) { EXPECT_TRUE(load_waiter_->browser_context()); - if (!load_waiter_.browser_context()) + if (!load_waiter_->browser_context()) return false; ConstValueVector args; args.push_back(new base::StringValue(test_fixture)); -- 2.11.4.GIT