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

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

Issue 11618049: Cleanup: Remove unneeded browser_thread.h includes in contents. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix build Created 7 years, 11 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/time.h" 5 #include "base/time.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "content/browser/renderer_host/render_view_host_impl.h" 8 #include "content/browser/renderer_host/render_view_host_impl.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
11 #include "content/public/browser/notification_types.h" 11 #include "content/public/browser/notification_types.h"
12 #include "content/public/browser/web_contents_observer.h" 12 #include "content/public/browser/web_contents_observer.h"
13 #include "content/public/test/browser_test_utils.h" 13 #include "content/public/test/browser_test_utils.h"
14 #include "content/public/test/test_browser_thread.h"
15 #include "content/shell/shell.h" 14 #include "content/shell/shell.h"
16 #include "content/test/content_browser_test.h" 15 #include "content/test/content_browser_test.h"
17 #include "content/test/content_browser_test_utils.h" 16 #include "content/test/content_browser_test_utils.h"
18 #include "net/base/host_port_pair.h" 17 #include "net/base/host_port_pair.h"
19 #include "net/base/net_util.h" 18 #include "net/base/net_util.h"
20 #include "net/test/test_server.h" 19 #include "net/test/test_server.h"
21 20
22 namespace content { 21 namespace content {
23 22
24 class RenderViewHostTest : public ContentBrowserTest { 23 class RenderViewHostTest : public ContentBrowserTest {
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 EXPECT_EQ(1, observer.navigation_count()); 224 EXPECT_EQ(1, observer.navigation_count());
226 225
227 // But should be set to the original page when reading MHTML. 226 // But should be set to the original page when reading MHTML.
228 test_url = net::FilePathToFileURL(test_server()->document_root().Append( 227 test_url = net::FilePathToFileURL(test_server()->document_root().Append(
229 FILE_PATH_LITERAL("google.mht"))); 228 FILE_PATH_LITERAL("google.mht")));
230 NavigateToURL(shell(), test_url); 229 NavigateToURL(shell(), test_url);
231 EXPECT_EQ("http://www.google.com/", observer.base_url().spec()); 230 EXPECT_EQ("http://www.google.com/", observer.base_url().spec());
232 } 231 }
233 232
234 } // namespace content 233 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698