Changes to upgrade to public version of selenium

Pulls in new selenium (selenium_rc) 
and removes old selenium (java, py) dependencies
also removes doxygen dependency

This is dependent on this CL

http://codereview.appspot.com/96131

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21712 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 22 insertions, 36 deletions

diff --git a/o3d/DEPS b/o3d/DEPS
index 921a2ae..c56f551 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -2,7 +2,7 @@ vars = {
   "chromium_trunk":
     "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "28",
-  "o3d_code_rev": "101",
+  "o3d_code_rev": "103",
   "skia_rev": "279",
   "gyp_rev": "553",
   "gtest_rev": "267",
@@ -24,9 +24,6 @@ deps = {
   "o3d/third_party/chrome":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/chrome@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/doxygen":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/doxygen@" + Var("o3d_code_rev"),
-
   "o3d/third_party/fcollada":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + Var("o3d_code_rev"),
 
@@ -36,9 +33,6 @@ deps = {
   "o3d/third_party/icu38":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/icu38@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/java":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/java@" + Var("o3d_code_rev"),
-
   "o3d/third_party/jpeg":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jpeg@" + Var("o3d_code_rev"),
 
@@ -51,12 +45,12 @@ deps = {
   "o3d/third_party/png":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/png@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/py":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/py@" + Var("o3d_code_rev"),
-
   "o3d/third_party/scons":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var("o3d_code_rev"),
 
+  "o3d/third_party/selenium_rc":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@" + Var("o3d_code_rev"),
+
   "o3d/third_party/skia":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/skia/files@" + Var("o3d_code_rev"),
 
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index 3518adb..69ee840 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -3,7 +3,7 @@ vars = {
     "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "28",
   "chromium_rev": "21287",
-  "o3d_code_rev": "101",
+  "o3d_code_rev": "103",
   "skia_rev": "279",
   "gyp_rev": "553",
   "gtest_rev": "267",
@@ -23,30 +23,24 @@ deps = {
   "third_party/cg":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3d_code_rev"),
 
-  "third_party/doxygen":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/doxygen@" + Var("o3d_code_rev"),
-
   "third_party/fcollada":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + Var("o3d_code_rev"),
 
   "third_party/glew":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/glew@" + Var("o3d_code_rev"),
 
-  "third_party/java":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/java@" + Var("o3d_code_rev"),
-
   "third_party/jsdoctoolkit":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"),
 
   "third_party/pdiff":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"),
 
-  "third_party/py":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/py@" + Var("o3d_code_rev"),
-
   "third_party/scons":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var("o3d_code_rev"),
 
+  "third_party/selenium_rc":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@" + Var("o3d_code_rev"),
+
   "third_party/vectormath":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" + Var("o3d_code_rev"),
 
diff --git a/o3d/svn_paths.scons b/o3d/svn_paths.scons
index 79d4c78..8cb9cde 100644
--- a/o3d/svn_paths.scons
+++ b/o3d/svn_paths.scons
@@ -72,8 +72,9 @@ env.Replace(
     PLY_DIR = '$THIRD_PARTY/ply',
     PNG_DIR = '$THIRD_PARTY/png/src',
     SCONS_DIR = '$THIRD_PARTY/scons',
-    SELENIUM_JAVA_DIR = '$THIRD_PARTY/java/selenium/rev2478_mod',
-    SELENIUM_PYTHON_DIR = '$THIRD_PARTY/py/selenium',
+    SELENIUM_JAVA_DIR = '$THIRD_PARTY/selenium_rc/files/selenium-server',
+    SELENIUM_PYTHON_DIR = (
+        '$THIRD_PARTY/selenium_rc/files/selenium-python-client-driver'),
     # TODO: pull from SVN with gclient ?
     SKIA_DIR = '$THIRD_PARTY/skia',
     SWIFTSHADER_DIR = '$INTERNAL_DIR/third_party/swiftshader/files',
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons
index dd46488..ee252a2 100644
--- a/o3d/tests/build.scons
+++ b/o3d/tests/build.scons
@@ -503,7 +503,7 @@ if ARGUMENTS.get('SYSTEM_TESTS_ENABLED', False):
 
 run_env.Replace(
     SELENIUM_VERBOSE = ARGUMENTS.get('SELENIUM_VERBOSE', '0'),
-    SELENIUM_SERVER_JAR = '$SELENIUM_JAVA_DIR/server/selenium-server.jar',
+    SELENIUM_SERVER_JAR = '$SELENIUM_JAVA_DIR/selenium-server.jar',
     SELENIUM_TEST_PREFIX = ARGUMENTS.get('SELENIUM_TEST_PREFIX', 'Test'),
     SELENIUM_TEST_SUFFIXES = ARGUMENTS.get('SELENIUM_TEST_SUFFIXES',
                                            'small,medium,large'),
diff --git a/o3d/tests/selenium/main.py b/o3d/tests/selenium/main.py
index 49a1930..9ae98db 100644
--- a/o3d/tests/selenium/main.py
+++ b/o3d/tests/selenium/main.py
@@ -55,8 +55,7 @@ import gflags
 import javascript_unit_tests
 # Import custom testrunner for pulse
 import pulse_testrunner
-# TODO: figure out if we can remove this hard-coded version
-import rev2478_mod as selenium
+import selenium
 import samples_tests
 import selenium_constants
 import selenium_utilities
@@ -203,7 +202,7 @@ class LocalFileHTTPServer(threading.Thread):
     http_server = LocalFileHTTPServer(local_root)
     http_server.setDaemon(True)
     http_server.start()
-    
+
     time_out = 30.0
 
     # Wait till the Selenium RC Server is up
@@ -320,7 +319,7 @@ class SeleniumRemoteControl(threading.Thread):
     selenium_server.start()
 
     time_out = 30.0
-    
+
     # Wait till the Selenium RC Server is up
     print 'Waiting %d seconds for Selenium RC to start.' % (int(time_out))
     selenium_server.selenium_alive.wait(time_out)
@@ -356,15 +355,15 @@ class SeleniumSession(object):
       java_path: path to java used to run selenium.
       selenium_server: path to jar containing selenium server.
       server_timeout: server timeout value, in seconds.
-      http_root: Serve http pages using this path as the document root.  When 
+      http_root: Serve http pages using this path as the document root.  When
       None, use the default.
     """
     # Start up a static file server, to serve the test pages.
 
-    if not http_root: 
+    if not http_root:
       # Serve from the o3d directory
       http_root = TESTING_ROOT + "/../"
-    
+
     self.http_server = LocalFileHTTPServer.StartServer(http_root)
 
     if self.http_server:
@@ -431,9 +430,7 @@ class SeleniumSession(object):
 
   def TearDown(self):
     """Stops the selenium server."""
-    self.session.do_command("shutDown", [])
-    # Sync with selenium_server thread
-    self.selenium_server.join()
+    self.session.shut_down_selenium_server()
 
   def TestBrowser(self, browser, test_list, test_prefix, test_suffixes,
                   server_timeout):
@@ -809,7 +806,7 @@ def CompareScreenshots(browser, test_list, screencompare, screenshotsdir,
     use_downsample = False
     use_edge = True
     edge_threshold = "5"
-    
+
     # Find out if the test specified any options relating to perceptual diff
     # that will override the defaults.
     for opt in test_options:
@@ -860,7 +857,7 @@ def CompareScreenshots(browser, test_list, screencompare, screenshotsdir,
         arguments += ["-downsample", downsample_factor]
       if use_edge:
         arguments += ["-ignoreEdges", edge_threshold]
-        
+
       # Print the perceptual diff command line so we can debug easier.
       if verbose:
         print " ".join(arguments)
@@ -944,7 +941,7 @@ def main(unused_argv):
                                      FLAGS.servertimeout)
   if not selenium_session.http_server or not selenium_session.selenium_server:
     return 1
-  
+
   for browser in FLAGS.browser:
     if browser in set(selenium_constants.SELENIUM_BROWSER_SET):
       test_list = []