summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 01:30:15 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 01:30:15 +0000
commitdad1e3bc1d2894be09c2a5bcb98708044aa1664d (patch)
tree4ea147acd5e4a05523093245064fc67614e7730f /chrome/browser
parentcc3abd1c3aa8f6fa72f7a2954474a81510ff03c1 (diff)
downloadchromium_src-dad1e3bc1d2894be09c2a5bcb98708044aa1664d.zip
chromium_src-dad1e3bc1d2894be09c2a5bcb98708044aa1664d.tar.gz
chromium_src-dad1e3bc1d2894be09c2a5bcb98708044aa1664d.tar.bz2
Revert 31862 - Ensure AutomationMsg_SetCookieAsync is sent on IO thread.
These tests started failing with this checkin: AuthenticateSuccess AuthenticateWithTokenSuccess Review URL: http://codereview.chromium.org/387042 TBR=stoyan@chromium.org Review URL: http://codereview.chromium.org/389031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/automation/automation_profile_impl.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/automation/automation_profile_impl.cc b/chrome/browser/automation/automation_profile_impl.cc
index bb9b106..4d217d6 100644
--- a/chrome/browser/automation/automation_profile_impl.cc
+++ b/chrome/browser/automation/automation_profile_impl.cc
@@ -63,7 +63,7 @@ class AutomationCookieStore : public net::CookieStore {
if (cookie_set) {
// TODO(eroman): Should NOT be accessing the profile from here, as this
// is running on the IO thread.
- SendIPCMessageOnIOThread(new AutomationMsg_SetCookieAsync(0,
+ automation_client_->Send(new AutomationMsg_SetCookieAsync(0,
profile_->tab_handle(), url, cookie_line));
}
return cookie_set;
@@ -106,16 +106,6 @@ class AutomationCookieStore : public net::CookieStore {
}
protected:
- void SendIPCMessageOnIOThread(IPC::Message* m) {
- if (ChromeThread::CurrentlyOn(ChromeThread::IO)) {
- automation_client_->Send(m);
- } else {
- Task* task = NewRunnableMethod(this,
- &AutomationCookieStore::SendIPCMessageOnIOThread, m);
- ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, task);
- }
- }
-
AutomationProfileImpl* profile_;
net::CookieStore* original_cookie_store_;
IPC::Message::Sender* automation_client_;