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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager_browsertest.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <set> 5 #include <set>
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 14 matching lines...) Expand all
25 #include "content/public/common/url_constants.h" 25 #include "content/public/common/url_constants.h"
26 #include "content/public/test/browser_test_utils.h" 26 #include "content/public/test/browser_test_utils.h"
27 #include "content/public/test/test_navigation_observer.h" 27 #include "content/public/test/test_navigation_observer.h"
28 #include "content/public/test/test_utils.h" 28 #include "content/public/test/test_utils.h"
29 #include "content/shell/browser/shell.h" 29 #include "content/shell/browser/shell.h"
30 #include "content/test/content_browser_test.h" 30 #include "content/test/content_browser_test.h"
31 #include "content/test/content_browser_test_utils.h" 31 #include "content/test/content_browser_test_utils.h"
32 #include "net/base/net_util.h" 32 #include "net/base/net_util.h"
33 #include "net/test/spawned_test_server/spawned_test_server.h" 33 #include "net/test/spawned_test_server/spawned_test_server.h"
34 34
35 using base::ASCIIToUTF16;
36
35 namespace content { 37 namespace content {
36 38
37 class RenderFrameHostManagerTest : public ContentBrowserTest { 39 class RenderFrameHostManagerTest : public ContentBrowserTest {
38 public: 40 public:
39 RenderFrameHostManagerTest() {} 41 RenderFrameHostManagerTest() {}
40 42
41 static bool GetFilePathWithHostAndPortReplacement( 43 static bool GetFilePathWithHostAndPortReplacement(
42 const std::string& original_file_path, 44 const std::string& original_file_path,
43 const net::HostPortPair& host_port_pair, 45 const net::HostPortPair& host_port_pair,
44 std::string* replacement_path) { 46 std::string* replacement_path) {
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 NavigateToURL(shell(), https_server.GetURL("files/title1.html")); 1354 NavigateToURL(shell(), https_server.GetURL("files/title1.html"));
1353 1355
1354 // Make sure it ends up at the right page. 1356 // Make sure it ends up at the right page.
1355 WaitForLoadStop(shell()->web_contents()); 1357 WaitForLoadStop(shell()->web_contents());
1356 EXPECT_EQ(https_server.GetURL("files/title1.html"), 1358 EXPECT_EQ(https_server.GetURL("files/title1.html"),
1357 shell()->web_contents()->GetLastCommittedURL()); 1359 shell()->web_contents()->GetLastCommittedURL());
1358 EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance()); 1360 EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance());
1359 } 1361 }
1360 1362
1361 } // namespace content 1363 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698