[telemetry] Move tab from RunState to PageState.

tools/telemetry/telemetry/page/page_test.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import logging
 
 from telemetry.page import test_expectations
 from telemetry.page.actions import all_page_actions
 from telemetry.page.actions import navigate
 from telemetry.page.actions import page_action
 
@@ skipping 85 matching lines @@
   @property
   def close_tabs_before_run(self):
     """When set to True, all tabs are closed before running the test for the
     first time."""
     return self._close_tabs_before_run
 
   @close_tabs_before_run.setter
   def close_tabs_before_run(self, close_tabs):
     self._close_tabs_before_run = close_tabs
 
-  def NeedsBrowserRestartAfterEachRun(self, tab):  # pylint: disable=W0613
+  def NeedsBrowserRestartAfterEachRun(self, browser):  # pylint: disable=W0613
     """Override to specify browser restart after each run."""
     return self._needs_browser_restart_after_each_run
 
   def AddCommandLineOptions(self, parser):
     """Override to expose command-line options for this test.
 
     The provided parser is an optparse.OptionParser instance and accepts all
     normal results. The parsed options are available in Run as
     self.options."""
     pass
@@ skipping 14 matching lines @@
     pass
 
   def DidStartBrowser(self, browser):
     """Override to customize the browser right after it has launched."""
     pass
 
   def CanRunForPage(self, page):  # pylint: disable=W0613
     """Override to customize if the test can be ran for the given page."""
     return True
 
-  def WillRunTest(self, tab):
+  def WillRunTest(self):
     """Override to do operations before the page set(s) are navigated."""
     pass
 
-  def DidRunTest(self, tab, results):
+  def DidRunTest(self, browser, results):
     """Override to do operations after all page set(s) are completed.
 
     This will occur before the browser is torn down.
     """
     pass
 
-  def WillRunPageRepeats(self, page, tab):
+  def WillRunPageRepeats(self, page):
     """Override to do operations before each page is iterated over."""
     pass
 
-  def DidRunPageRepeats(self, page, tab):
+  def DidRunPageRepeats(self, page):
     """Override to do operations after each page is iterated over."""
     pass
 
   def DidStartHTTPServer(self, tab):
     """Override to do operations after the HTTP server is started."""
     pass
 
   def WillNavigateToPage(self, page, tab):
     """Override to do operations before the page is navigated, notably Telemetry
     will already have performed the following operations on the browser before
@@ skipping 18 matching lines @@
   def CreatePageSet(self, args, options):   # pylint: disable=W0613
     """Override to make this test generate its own page set instead of
     allowing arbitrary page sets entered from the command-line."""
     return None
 
   def CreateExpectations(self, page_set):   # pylint: disable=W0613
     """Override to make this test generate its own expectations instead of
     any that may have been defined in the page set."""
     return test_expectations.TestExpectations()
 
-  def TabForPage(self, page, tab):   # pylint: disable=W0613
+  def TabForPage(self, page, browser):   # pylint: disable=W0613
     """Override to select a different tab for the page.  For instance, to
     create a new tab for every page, return tab.browser.tabs.New()."""

[Luigi Semenzato, 2013/10/26 05:11:49]

The comment is out of sync.

[dtu, 2013/10/28 19:26:55]

Done.

-    return tab
+    return browser.tabs[0]
 
   def ValidatePageSet(self, page_set):
     """Override to examine the page set before the test run.  Useful for
     example to validate that the pageset can be used with the test."""
     pass
 
   def Run(self, options, page, tab, results):
     self.options = options
     compound_action = GetCompoundActionFromPage(page, self._action_name_to_run)
     self._RunCompoundAction(page, tab, compound_action)
@@ skipping 42 matching lines @@
 
   def IsExiting(self):
     return self._exit_requested
 
   def RequestExit(self):
     self._exit_requested = True
 
   @property
   def action_name_to_run(self):
     return self._action_name_to_run