| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <queue> | 5 #include <queue> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 | 9 |
| 10 #include "chrome/browser/extensions/extension_event_router_forwarder.h" | 10 #include "chrome/browser/extensions/extension_event_router_forwarder.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 private: | 51 private: |
| 52 // IPC::Message::Sender | 52 // IPC::Message::Sender |
| 53 virtual bool Send(IPC::Message* message) { | 53 virtual bool Send(IPC::Message* message) { |
| 54 EXPECT_EQ(ExtensionMsg_MessageInvoke::ID, message->type()); | 54 EXPECT_EQ(ExtensionMsg_MessageInvoke::ID, message->type()); |
| 55 | 55 |
| 56 EXPECT_FALSE(task_queue_.empty()); | 56 EXPECT_FALSE(task_queue_.empty()); |
| 57 MessageLoop::current()->PostTask(FROM_HERE, task_queue_.front()); | 57 MessageLoop::current()->PostTask(FROM_HERE, task_queue_.front()); |
| 58 task_queue_.pop(); | 58 task_queue_.pop(); |
| 59 | 59 |
| 60 return false; | 60 delete message; |
| 61 return true; |
| 61 } | 62 } |
| 62 | 63 |
| 63 std::queue<Task*> task_queue_; | 64 std::queue<Task*> task_queue_; |
| 64 }; | 65 }; |
| 65 | 66 |
| 66 class ExtensionWebRequestTest : public testing::Test { | 67 class ExtensionWebRequestTest : public testing::Test { |
| 67 protected: | 68 protected: |
| 68 virtual void SetUp() { | 69 virtual void SetUp() { |
| 69 event_router_ = new ExtensionEventRouterForwarder(); | 70 event_router_ = new ExtensionEventRouterForwarder(); |
| 70 enable_referrers_.Init( | 71 enable_referrers_.Init( |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 MessageLoop::current()->Run(); | 158 MessageLoop::current()->Run(); |
| 158 | 159 |
| 159 EXPECT_TRUE(!request.is_pending()); | 160 EXPECT_TRUE(!request.is_pending()); |
| 160 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); | 161 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); |
| 161 EXPECT_EQ(0, request.status().os_error()); | 162 EXPECT_EQ(0, request.status().os_error()); |
| 162 EXPECT_EQ(redirect_url, request.url()); | 163 EXPECT_EQ(redirect_url, request.url()); |
| 163 EXPECT_EQ(2U, request.url_chain().size()); | 164 EXPECT_EQ(2U, request.url_chain().size()); |
| 164 EXPECT_EQ(0U, ipc_sender_.GetNumTasks()); | 165 EXPECT_EQ(0U, ipc_sender_.GetNumTasks()); |
| 165 } | 166 } |
| 166 } | 167 } |
| OLD | NEW |