Switch to new release poller for nacl sdk waterfall.

masters/master.client.nacl.sdk/master.cfg

Index: masters/master.client.nacl.sdk/master.cfg
diff --git a/masters/master.client.nacl.sdk/master.cfg b/masters/master.client.nacl.sdk/master.cfg
index fb4cfe0c3b626d06cd791622e9da286434fffd8d..d0947c1a3ae0a7cd48cd23b5737f20a3a6c9c683 100644
--- a/masters/master.client.nacl.sdk/master.cfg
+++ b/masters/master.client.nacl.sdk/master.cfg
@@ -21,7 +21,7 @@ from buildbot.scheduler import Scheduler
 from common import chromium_utils
 
 from master import build_utils
-from master import svn_poller_with_comparator
+from master import buildspec_utils
 from master import gitiles_poller
 from master import master_utils
 from master import slaves_list
@@ -32,6 +32,10 @@ import master_site_config
 
 ActiveMaster = master_site_config.NativeClientSDK
 
+if config.Master.git_internal_server_url is None:
+  config.Master.git_internal_server_url = (
+      'https://chrome-internal.googlesource.com')
+
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
@@ -52,35 +56,17 @@ def ChromiumNativeClientChangeFilter(commit_json, branch):
   return False
 
 
-def NativeClientSDKReleaseTreeFileSplitter(path):
-  """Filter chromium commits to those relevant to the sdk release.
-
-  Arguments:
-    path: a path which svn reports has changed.
-  Returns:
-    A tuple containing (branchname, subpath).
-  """
-  return ('multirel', path)
-
-
 multi_poller = gitiles_poller.GitilesPoller(
     repo_url=config.Master.git_server_url + '/chromium/src',
     svn_branch='multi',
     change_filter=ChromiumNativeClientChangeFilter)
 
-multirel_poller = svn_poller_with_comparator.SvnPollerWithComparator(
-    multi_poller.comparator,
-    svnurl=('%s/tools/buildspec/build/chrome-official' %
-        config.Master.trunk_internal_url),
-    svnbin=chromium_utils.SVN_BIN,
-    split_file=NativeClientSDKReleaseTreeFileSplitter,
-    revlinktmpl=(
-        'http://chromesshgw.corp.google.com/viewvc/chrome-internal?view=rev&revision=%s'),
-    pollinterval=10)
+release_poller = buildspec_utils.BuildspecPoller(
+    ['build/chrome-official'], svn_mode=False)
 
 c['change_source'] = [
     multi_poller,
-    multirel_poller,
+    release_poller,
 ]