[chromedirver] Add 33 to test suite and remove 30.

Also update OWNERS and WATCHLISTS file for my account change.

BUG=None

Review URL: https://codereview.chromium.org/143653003

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

6 files changed, 6 insertions, 10 deletions

diff --git a/chrome/test/chromedriver/OWNERS b/chrome/test/chromedriver/OWNERS
index a3cb147..b2fe24d 100644
--- a/chrome/test/chromedriver/OWNERS
+++ b/chrome/test/chromedriver/OWNERS
@@ -1,3 +1,3 @@
-chrisgao@chromium.org
 craigdh@chromium.org
 frankf@chromium.org
+stgao@chromium.org
diff --git a/chrome/test/chromedriver/archive.py b/chrome/test/chromedriver/archive.py
index e203c36d..aaebe8c 100644
--- a/chrome/test/chromedriver/archive.py
+++ b/chrome/test/chromedriver/archive.py
@@ -10,9 +10,9 @@ import urllib
 
 import util
 
-CHROME_30_REVISION = '217281'
 CHROME_31_REVISION = '225096'
 CHROME_32_REVISION = '232870'
+CHROME_33_REVISION = '241075'
 
 _SITE = 'http://commondatastorage.googleapis.com'
 
diff --git a/chrome/test/chromedriver/chrome/version.cc b/chrome/test/chromedriver/chrome/version.cc
index 27f16d0..249e7b6 100644
--- a/chrome/test/chromedriver/chrome/version.cc
+++ b/chrome/test/chromedriver/chrome/version.cc
@@ -9,7 +9,7 @@
 namespace {
 
 // This variable must be able to be found and parsed by the upload script.
-const int kMinimumSupportedChromeVersion[] = {30, 0, 1573, 2};
+const int kMinimumSupportedChromeVersion[] = {31, 0, 1650, 59};
 
 }  // namespace
 
diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc
index a00fffd..61adada3 100644
--- a/chrome/test/chromedriver/chrome_launcher.cc
+++ b/chrome/test/chromedriver/chrome_launcher.cc
@@ -95,12 +95,11 @@ Status PrepareCommandLine(int port,
   CommandLine command(program);
   Switches switches;
 
-  // TODO(chrisgao): Add "disable-sync" when chrome 30- is not supported.
-  // For chrome 30-, it leads to crash when opening chrome://settings.
   for (size_t i = 0; i < arraysize(kCommonSwitches); ++i)
     switches.SetSwitch(kCommonSwitches[i]);
   switches.SetSwitch("disable-hang-monitor");
   switches.SetSwitch("disable-prompt-on-repost");
+  switches.SetSwitch("disable-sync");
   switches.SetSwitch("full-memory-crash-report");
   switches.SetSwitch("no-first-run");
   switches.SetSwitch("disable-background-networking");
diff --git a/chrome/test/chromedriver/test/run_all_tests.py b/chrome/test/chromedriver/test/run_all_tests.py
index 769bb32..d0525ad 100755
--- a/chrome/test/chromedriver/test/run_all_tests.py
+++ b/chrome/test/chromedriver/test/run_all_tests.py
@@ -190,9 +190,9 @@ def main():
     latest_snapshot_revision = archive.GetLatestRevision(archive.Site.SNAPSHOT)
     versions = [
         ['HEAD', latest_snapshot_revision],
+        ['33', archive.CHROME_33_REVISION],
         ['32', archive.CHROME_32_REVISION],
-        ['31', archive.CHROME_31_REVISION],
-        ['30', archive.CHROME_30_REVISION]
+        ['31', archive.CHROME_31_REVISION]
     ]
     code = 0
     for version in versions:
diff --git a/chrome/test/chromedriver/test/test_expectations b/chrome/test/chromedriver/test/test_expectations
index 03219cc..ce86b50 100644
--- a/chrome/test/chromedriver/test/test_expectations
+++ b/chrome/test/chromedriver/test/test_expectations
@@ -93,9 +93,6 @@ _REVISION_NEGATIVE_FILTER['HEAD'] = [
 _REVISION_NEGATIVE_FILTER['31'] = _REVISION_NEGATIVE_FILTER['HEAD'] + [
     'I18nTest.*',  # This was fixed in a later version of 31 than we use.
 ]
-_REVISION_NEGATIVE_FILTER['30'] = _REVISION_NEGATIVE_FILTER['HEAD'] + [
-    'I18nTest.*',
-]
 
 
 _OS_NEGATIVE_FILTER = {}