Move clear_system_cache_for_browser_and_profile_on_start to BrowserOptions

BUG=269131
TEST=trybot

Review URL: https://chromiumcodereview.appspot.com/24064002

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

tools/perf/measurements/startup.py

@@ -36,7 +36,8 @@ class Startup(page_measurement.PageMeasurement):
     # assert options.warm != options.cold, \
     #     "You must specify either --warm or --cold"
     if options.cold:
-      options.clear_sytem_cache_for_browser_and_profile_on_start = True
+      browser_options = options.browser_options
+      browser_options.clear_sytem_cache_for_browser_and_profile_on_start = True
     else:
       self.discard_first_result = True
 

tools/telemetry/telemetry/core/browser.py

@@ -261,8 +261,8 @@ class Browser(object):
     return self._browser_backend.GetTraceResultAndReset()
 
   def Start(self):
-    finder_options = self._browser_backend.finder_options
-    if finder_options.clear_sytem_cache_for_browser_and_profile_on_start:
+    browser_options = self._browser_backend.browser_options
+    if browser_options.clear_sytem_cache_for_browser_and_profile_on_start:
       if self._platform.CanFlushIndividualFilesFromSystemCache():
         self._platform.FlushSystemCacheForDirectory(
             self._browser_backend.profile_directory)

tools/telemetry/telemetry/core/browser_options.py

@@ -29,7 +29,6 @@ class BrowserFinderOptions(optparse.Values):
     self.cros_ssh_identity = None
 
     self.extensions_to_load = []
-    self.clear_sytem_cache_for_browser_and_profile_on_start = False
 
     # If set, copy the generated profile to this path on exit.
     self.output_profile_path = None
@@ -210,6 +209,8 @@ class BrowserOptions():
 
     self.keep_test_server_ports = False
 
+    self.clear_sytem_cache_for_browser_and_profile_on_start = False
+
   def AddCommandLineOptions(self, parser):
     group = optparse.OptionGroup(parser, 'Browser options')
     profile_choices = profile_types.GetProfileTypes()