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

Side by Side Diff: content/browser/session_history_browsertest.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/strings/string_util.h" 5 #include "base/strings/string_util.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/public/browser/navigation_controller.h" 8 #include "content/public/browser/navigation_controller.h"
9 #include "content/public/browser/notification_service.h" 9 #include "content/public/browser/notification_service.h"
10 #include "content/public/browser/notification_types.h" 10 #include "content/public/browser/notification_types.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 return shell()->web_contents()->GetLastCommittedURL(); 92 return shell()->web_contents()->GetLastCommittedURL();
93 } 93 }
94 94
95 GURL GetURL(const std::string file) { 95 GURL GetURL(const std::string file) {
96 return embedded_test_server()->GetURL( 96 return embedded_test_server()->GetURL(
97 std::string("/session_history/") + file); 97 std::string("/session_history/") + file);
98 } 98 }
99 99
100 void NavigateAndCheckTitle(const char* filename, 100 void NavigateAndCheckTitle(const char* filename,
101 const std::string& expected_title) { 101 const std::string& expected_title) {
102 string16 expected_title16(ASCIIToUTF16(expected_title)); 102 base::string16 expected_title16(ASCIIToUTF16(expected_title));
103 TitleWatcher title_watcher(shell()->web_contents(), expected_title16); 103 TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
104 NavigateToURL(shell(), GetURL(filename)); 104 NavigateToURL(shell(), GetURL(filename));
105 ASSERT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); 105 ASSERT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
106 } 106 }
107 107
108 bool CanGoBack() { 108 bool CanGoBack() {
109 return shell()->web_contents()->GetController().CanGoBack(); 109 return shell()->web_contents()->GetController().CanGoBack();
110 } 110 }
111 111
112 bool CanGoForward() { 112 bool CanGoForward() {
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 NavigateToURL(shell(), GetURL("title2.html")); 490 NavigateToURL(shell(), GetURL("title2.html"));
491 491
492 ASSERT_TRUE(ExecuteScriptAndExtractInt( 492 ASSERT_TRUE(ExecuteScriptAndExtractInt(
493 shell()->web_contents(), 493 shell()->web_contents(),
494 "domAutomationController.send(history.length)", 494 "domAutomationController.send(history.length)",
495 &length)); 495 &length));
496 EXPECT_EQ(2, length); 496 EXPECT_EQ(2, length);
497 } 497 }
498 498
499 } // namespace content 499 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | content/browser/site_instance_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698