Cherrypick r11508 into 2.5 release branch.



git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.5@11509 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/benchmarks/BenchmarkShell.java b/user/src/com/google/gwt/benchmarks/BenchmarkShell.java
index 1607464..40afc4a 100644
--- a/user/src/com/google/gwt/benchmarks/BenchmarkShell.java
+++ b/user/src/com/google/gwt/benchmarks/BenchmarkShell.java
@@ -30,7 +30,9 @@
  * This class is responsible for hosting BenchMarks test case execution.
  * 
  * @see JUnitShell
+ * @deprecated This class is scheduled to be removed in the next GWT release.
  */
+@Deprecated
 public class BenchmarkShell {
 
   /**
diff --git a/user/src/com/google/gwt/benchmarks/client/Benchmark.java b/user/src/com/google/gwt/benchmarks/client/Benchmark.java
index b0b2db6..0e4ede7 100644
--- a/user/src/com/google/gwt/benchmarks/client/Benchmark.java
+++ b/user/src/com/google/gwt/benchmarks/client/Benchmark.java
@@ -92,7 +92,10 @@
  * test methods, parameterized test methods, and time limits.
  * 
  * {@example com.google.gwt.examples.benchmarks.ArrayListBenchmark}
+ *
+ * @deprecated This class is scheduled to be removed in the next GWT release.
  */
+@Deprecated
 public abstract class Benchmark extends GWTTestCase {
 
   /**