summaryrefslogtreecommitdiffstats
path: root/chrome/test/base/ui_test_utils.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-15 19:26:57 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-15 19:26:57 +0000
commit4454296e8258c95bbc9dff825147894d760f4961 (patch)
tree9e598b78e4e1c981a90f2ad0ed59162ea899b4e5 /chrome/test/base/ui_test_utils.h
parent237529729bf9b6040a8dbde022e4b9c1f557cab2 (diff)
downloadchromium_src-4454296e8258c95bbc9dff825147894d760f4961.zip
chromium_src-4454296e8258c95bbc9dff825147894d760f4961.tar.gz
chromium_src-4454296e8258c95bbc9dff825147894d760f4961.tar.bz2
Revert 151716 - Add NaCl smoke test to browser_tests.
The new test fails on some bots: http://build.chromium.org/p/chromium.memory/builders/Chromium%20OS%20ASAN%20Tests%20%281%29/builds/992/steps/browser_tests/logs/stdio http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Tests%20%281%29/builds/1195/steps/browser_tests/logs/stdio The smoke test is simple - it checks that Chrome can load nexes. The more interesting part of this CL is that it lays the groundwork for adding more NaCl tests to browser_tests. This will allow many nacl_integration tests to be rewritten as browser_tests. This CL adds an extensible jig for decoding messages from Javascript, which makes it easier to add test logic in the web page. This CL also establishes locations in the build directory for nexes and other test data. There are two followup CLs planned: 1) simplify how nexes are built in GYP and 2) share the code for running tests in Javascript with the PPAPI test suite. BUG= http://code.google.com/p/nativeclient/issues/detail?id=2959 TEST= browser_tests --gtest_filter=NaClBrowserTest* Review URL: https://chromiumcodereview.appspot.com/10837207 TBR=ncbray@chromium.org Review URL: https://chromiumcodereview.appspot.com/10827356 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/ui_test_utils.h')
-rw-r--r--chrome/test/base/ui_test_utils.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index d1f3cab..d500c90 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -130,9 +130,6 @@ FilePath GetTestFilePath(const FilePath& dir, const FilePath& file);
// The returned path is GURL format.
GURL GetTestUrl(const FilePath& dir, const FilePath& file);
-// Generate the path of the build directory, relative to the source root.
-bool GetRelativeBuildDirectory(FilePath *build_dir);
-
// Blocks until an application modal dialog is showns and returns it.
AppModalDialog* WaitForAppModalDialog();