Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Side by Side Diff: content/browser/renderer_host/resource_queue_unittest.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/message_loop.h" 6 #include "base/message_loop.h"
7 #include "content/browser/browser_thread.h" 7 #include "content/browser/browser_thread.h"
8 #include "content/browser/mock_resource_context.h" 8 #include "content/browser/mock_resource_context.h"
9 #include "content/browser/renderer_host/dummy_resource_handler.h" 9 #include "content/browser/renderer_host/dummy_resource_handler.h"
10 #include "content/browser/renderer_host/global_request_id.h" 10 #include "content/browser/renderer_host/global_request_id.h"
11 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" 11 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
12 #include "content/browser/renderer_host/resource_queue.h" 12 #include "content/browser/renderer_host/resource_queue.h"
13 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
14 #include "net/url_request/url_request.h" 14 #include "net/url_request/url_request.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using content::DummyResourceHandler; 17 using content::DummyResourceHandler;
18 18
19 namespace { 19 namespace {
20 20
21 const char kTestUrl[] = "data:text/plain,Hello World!"; 21 const char kTestUrl[] = "data:text/plain,Hello World!";
22 22
23 ResourceDispatcherHostRequestInfo* GetRequestInfo(int request_id) { 23 ResourceDispatcherHostRequestInfo* GetRequestInfo(int request_id) {
24 return new ResourceDispatcherHostRequestInfo( 24 return new ResourceDispatcherHostRequestInfo(
25 new DummyResourceHandler(), ChildProcessInfo::RENDER_PROCESS, 0, 0, 0, 25 new DummyResourceHandler(), ChildProcessInfo::RENDER_PROCESS, 0, 0, 0,
26 request_id, false, -1, ResourceType::MAIN_FRAME, PageTransition::LINK, 0, 26 request_id, false, -1, ResourceType::MAIN_FRAME,
27 false, false, false, content::MockResourceContext::GetInstance()); 27 content::PAGE_TRANSITION_LINK, 0, false, false, false,
28 content::MockResourceContext::GetInstance());
28 } 29 }
29 30
30 void InitializeQueue(ResourceQueue* queue, ResourceQueueDelegate* delegate) { 31 void InitializeQueue(ResourceQueue* queue, ResourceQueueDelegate* delegate) {
31 ResourceQueue::DelegateSet delegate_set; 32 ResourceQueue::DelegateSet delegate_set;
32 delegate_set.insert(delegate); 33 delegate_set.insert(delegate);
33 queue->Initialize(delegate_set); 34 queue->Initialize(delegate_set);
34 } 35 }
35 36
36 void InitializeQueue(ResourceQueue* queue, 37 void InitializeQueue(ResourceQueue* queue,
37 ResourceQueueDelegate* delegate1, 38 ResourceQueueDelegate* delegate1,
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 MessageLoop::current()->RunAllPending(); 236 MessageLoop::current()->RunAllPending();
236 EXPECT_EQ(0, response_started_count_); 237 EXPECT_EQ(0, response_started_count_);
237 238
238 queue.Shutdown(); 239 queue.Shutdown();
239 240
240 MessageLoop::current()->RunAllPending(); 241 MessageLoop::current()->RunAllPending();
241 EXPECT_EQ(0, response_started_count_); 242 EXPECT_EQ(0, response_started_count_);
242 } 243 }
243 244
244 } // namespace 245 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698