Defining the test expectations object

tools/telemetry/telemetry/page/page_test_runner.py

Index: tools/telemetry/telemetry/page/page_test_runner.py
diff --git a/tools/telemetry/telemetry/page/page_test_runner.py b/tools/telemetry/telemetry/page/page_test_runner.py
index 7a1b18a6d1b7a32d0f7ef73ad4c2121c115a9d16..6b8fa9bef04fb1bbe08a7434fae4c10c119e6fa3 100644
--- a/tools/telemetry/telemetry/page/page_test_runner.py
+++ b/tools/telemetry/telemetry/page/page_test_runner.py
@@ -36,8 +36,9 @@ class PageTestRunner(object):
     return 'test'
 
   def Run(self, base_dir, page_set_filenames):
-    test, ps = self.ParseCommandLine(sys.argv, base_dir, page_set_filenames)
-    results = page_runner.Run(test, ps, self._options)
+    test, ps, expectations = self.ParseCommandLine(sys.argv, base_dir,
+        page_set_filenames)
+    results = page_runner.Run(test, ps, expectations, self._options)
     results.PrintSummary()
     return min(255, len(results.failures + results.errors))
 
@@ -162,13 +163,15 @@ class PageTestRunner(object):
 
     if isinstance(test, test_module.Test):
       ps = test.CreatePageSet(self._options)
+      expectations = test.CreateExpectations(ps)
     else:
       ps = self.GetPageSet(test, page_set_filenames)
+      expectations = test.CreateExpectations(ps)
 
     if len(self._args) > 2:
       self.PrintParseError('Too many arguments.')
 
-    return page_test, ps
+    return page_test, ps, expectations
 
   def PrintParseError(self, message):
     self._parser.error(message)