OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "chrome/test/automation/proxy_launcher.h" | 5 #include "chrome/test/automation/proxy_launcher.h" |
6 | 6 |
7 #include "app/sql/connection.h" | 7 #include "app/sql/connection.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
412 #endif | 412 #endif |
413 | 413 |
414 // The tests assume that file:// URIs can freely access other file:// URIs. | 414 // The tests assume that file:// URIs can freely access other file:// URIs. |
415 command_line->AppendSwitch(switches::kAllowFileAccessFromFiles); | 415 command_line->AppendSwitch(switches::kAllowFileAccessFromFiles); |
416 | 416 |
417 // Disable TabCloseableStateWatcher for tests. | 417 // Disable TabCloseableStateWatcher for tests. |
418 command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher); | 418 command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher); |
419 | 419 |
420 // Allow file:// access on ChromeOS. | 420 // Allow file:// access on ChromeOS. |
421 command_line->AppendSwitch(switches::kAllowFileAccess); | 421 command_line->AppendSwitch(switches::kAllowFileAccess); |
| 422 |
| 423 // Allow testing File API over http. |
| 424 command_line->AppendSwitch(switches::kUnlimitedQuotaForFiles); |
422 } | 425 } |
423 | 426 |
424 bool ProxyLauncher::LaunchBrowserHelper(const LaunchState& state, bool wait, | 427 bool ProxyLauncher::LaunchBrowserHelper(const LaunchState& state, bool wait, |
425 base::ProcessHandle* process) { | 428 base::ProcessHandle* process) { |
426 FilePath command = state.browser_directory.Append( | 429 FilePath command = state.browser_directory.Append( |
427 chrome::kBrowserProcessExecutablePath); | 430 chrome::kBrowserProcessExecutablePath); |
428 | 431 |
429 CommandLine command_line(command); | 432 CommandLine command_line(command); |
430 | 433 |
431 // Add command line arguments that should be applied to all UI tests. | 434 // Add command line arguments that should be applied to all UI tests. |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 LaunchBrowserAndServer(state, wait_for_initial_loads); | 575 LaunchBrowserAndServer(state, wait_for_initial_loads); |
573 } | 576 } |
574 | 577 |
575 void AnonymousProxyLauncher::TerminateConnection() { | 578 void AnonymousProxyLauncher::TerminateConnection() { |
576 CloseBrowserAndServer(); | 579 CloseBrowserAndServer(); |
577 } | 580 } |
578 | 581 |
579 std::string AnonymousProxyLauncher::PrefixedChannelID() const { | 582 std::string AnonymousProxyLauncher::PrefixedChannelID() const { |
580 return channel_id_; | 583 return channel_id_; |
581 } | 584 } |
OLD | NEW |