diff --git a/tools/telemetry/telemetry/core/browser_options.py b/tools/telemetry/telemetry/core/browser_options.py
index efa91e6180a373..0b490bb9713b2e 100644
--- a/tools/telemetry/telemetry/core/browser_options.py
+++ b/tools/telemetry/telemetry/core/browser_options.py
@@ -181,8 +181,8 @@ def CreateParser(self, *args, **kwargs):
         ' [default]')
     parser.add_option_group(group)
 
-    # Repeat options
-    repeat_options.RepeatOptions.AddCommandLineOptions(parser)
+    # Repeat options.
+    self.repeat_options.AddCommandLineOptions(parser)
 
     real_parse = parser.parse_args
     def ParseArgs(args=None):
@@ -224,7 +224,7 @@ def ParseArgs(args=None):
       if self.profile_type == 'default':
         self.dont_override_profile = True
 
-      # Parse repeat options
+      # Parse repeat options.
       self.repeat_options.UpdateFromParseResults(self, parser)
 
       if self.profile_dir and self.profile_type != 'clean':
diff --git a/tools/telemetry/telemetry/core/repeat_options.py b/tools/telemetry/telemetry/core/repeat_options.py
index 9836dea2267fb2..cb0030639b2ea6 100644
--- a/tools/telemetry/telemetry/core/repeat_options.py
+++ b/tools/telemetry/telemetry/core/repeat_options.py
@@ -18,8 +18,7 @@ def __deepcopy__(self, _):
     return RepeatOptions(self.page_repeat_secs, self.pageset_repeat_secs,
                          self.page_repeat_iters, self.pageset_repeat_iters)
 
-  @staticmethod
-  def AddCommandLineOptions(parser):
+  def AddCommandLineOptions(self, parser):
     group = optparse.OptionGroup(parser, 'Repeat options')
     group.add_option('--page-repeat', dest='page_repeat', default='1',
                      help='Number of iterations or length of time to repeat '
@@ -35,8 +34,8 @@ def AddCommandLineOptions(parser):
                      'seconds.')
     parser.add_option_group(group)
 
-  def _ParseRepeatOption(self, browser_options, input_str, parser):
-    match = re.match('([0-9]+)([sS]?)$', str(getattr(browser_options,
+  def _ParseRepeatOption(self, finder_options, input_str, parser):
+    match = re.match('([0-9]+)([sS]?)$', str(getattr(finder_options,
                                                      input_str, '')))
     if match:
       if match.group(2):
@@ -45,15 +44,15 @@ def _ParseRepeatOption(self, browser_options, input_str, parser):
         setattr(self, input_str + '_iters', 1)
       else:
         setattr(self, input_str + '_iters', int(match.group(1)))
-      delattr(browser_options, input_str)
+      delattr(finder_options, input_str)
     else:
       parser.error('Usage: --%s only accepts an int '
                    'followed by only an \'s\' if using time. '
                    'e.g. \'10\' or \'10s\'\n' % input_str.replace('_','-'))
 
-  def UpdateFromParseResults(self, browser_options, parser):
-    self._ParseRepeatOption(browser_options, 'page_repeat', parser)
-    self._ParseRepeatOption(browser_options, 'pageset_repeat', parser)
+  def UpdateFromParseResults(self, finder_options, parser):
+    self._ParseRepeatOption(finder_options, 'page_repeat', parser)
+    self._ParseRepeatOption(finder_options, 'pageset_repeat', parser)
 
   def IsRepeating(self):
     """Returns True if we will be repeating pages or pagesets."""