OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import datetime | 5 import datetime |
6 import glob | 6 import glob |
7 import heapq | 7 import heapq |
8 import logging | 8 import logging |
9 import os | 9 import os |
10 import os.path | 10 import os.path |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 args.append('--enable-crash-reporter-for-testing') | 258 args.append('--enable-crash-reporter-for-testing') |
259 args.append('--disable-component-update') | 259 args.append('--disable-component-update') |
260 if not self._is_content_shell: | 260 if not self._is_content_shell: |
261 args.append('--window-size=1280,1024') | 261 args.append('--window-size=1280,1024') |
262 if self._flash_path: | 262 if self._flash_path: |
263 args.append('--ppapi-flash-path=%s' % self._flash_path) | 263 args.append('--ppapi-flash-path=%s' % self._flash_path) |
264 # Also specify the version of Flash as a large version, so that it is | 264 # Also specify the version of Flash as a large version, so that it is |
265 # not overridden by the bundled or component-updated version of Flash. | 265 # not overridden by the bundled or component-updated version of Flash. |
266 args.append('--ppapi-flash-version=99.9.999.999') | 266 args.append('--ppapi-flash-version=99.9.999.999') |
267 if not self.browser_options.dont_override_profile: | 267 if not self.browser_options.dont_override_profile: |
| 268 print "Profile dir:", self._tmp_profile_dir |
268 args.append('--user-data-dir=%s' % self._tmp_profile_dir) | 269 args.append('--user-data-dir=%s' % self._tmp_profile_dir) |
269 else: | 270 else: |
270 args.append('--data-path=%s' % self._tmp_profile_dir) | 271 args.append('--data-path=%s' % self._tmp_profile_dir) |
271 | 272 |
272 trace_config_file = (self.platform_backend.tracing_controller_backend | 273 trace_config_file = (self.platform_backend.tracing_controller_backend |
273 .GetChromeTraceConfigFile()) | 274 .GetChromeTraceConfigFile()) |
274 if trace_config_file: | 275 if trace_config_file: |
275 args.append('--trace-config-file=%s' % trace_config_file) | 276 args.append('--trace-config-file=%s' % trace_config_file) |
276 return args | 277 return args |
277 | 278 |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
656 shutil.rmtree(self._tmp_profile_dir, ignore_errors=True) | 657 shutil.rmtree(self._tmp_profile_dir, ignore_errors=True) |
657 self._tmp_profile_dir = None | 658 self._tmp_profile_dir = None |
658 | 659 |
659 if self._tmp_output_file: | 660 if self._tmp_output_file: |
660 self._tmp_output_file.close() | 661 self._tmp_output_file.close() |
661 self._tmp_output_file = None | 662 self._tmp_output_file = None |
662 | 663 |
663 if self._tmp_minidump_dir: | 664 if self._tmp_minidump_dir: |
664 shutil.rmtree(self._tmp_minidump_dir, ignore_errors=True) | 665 shutil.rmtree(self._tmp_minidump_dir, ignore_errors=True) |
665 self._tmp_minidump_dir = None | 666 self._tmp_minidump_dir = None |
OLD | NEW |