summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 21:05:25 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 21:05:25 +0000
commit2aa336ea9a0edfa52a58a4856655370ddca794f3 (patch)
tree46223555bc23d93d72234181976499cd42b2708c /chrome/browser/automation
parenta8e91124532061d21f0114605530c605582144e8 (diff)
downloadchromium_src-2aa336ea9a0edfa52a58a4856655370ddca794f3.zip
chromium_src-2aa336ea9a0edfa52a58a4856655370ddca794f3.tar.gz
chromium_src-2aa336ea9a0edfa52a58a4856655370ddca794f3.tar.bz2
Add some shutdown perf tests. We measure shutdown for the combination of
shutdown method: {Close all windows, clicking exit, terminating process} and number of tabs open: {just about:blank, twenty tabs} BUG=23118 TEST=This CL adds a test. Review URL: http://codereview.chromium.org/1594008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_provider.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index addc2fd..7e96223 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -917,9 +917,9 @@ void AutomationProvider::ExecuteBrowserCommand(
IDC_HOME,
IDC_SELECT_NEXT_TAB,
IDC_SELECT_PREVIOUS_TAB,
+ IDC_SHOW_BOOKMARK_MANAGER,
IDC_SHOW_DOWNLOADS,
IDC_SHOW_HISTORY,
- IDC_SHOW_BOOKMARK_MANAGER,
};
if (browser_tracker_->ContainsHandle(handle)) {
Browser* browser = browser_tracker_->GetResource(handle);
@@ -1707,7 +1707,8 @@ class SetProxyConfigTask : public Task {
public:
SetProxyConfigTask(URLRequestContextGetter* request_context_getter,
const std::string& new_proxy_config)
- : request_context_getter_(request_context_getter), proxy_config_(new_proxy_config) {}
+ : request_context_getter_(request_context_getter),
+ proxy_config_(new_proxy_config) {}
virtual void Run() {
// First, deserialize the JSON string. If this fails, log and bail.
JSONStringValueSerializer deserializer(proxy_config_);