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

Side by Side Diff: chrome/test/automated_ui_tests/automated_ui_test_test.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/app/chrome_command_ids.h" 5 #include "chrome/app/chrome_command_ids.h"
6 #include "chrome/common/url_constants.h" 6 #include "chrome/common/url_constants.h"
7 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h" 7 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
8 #include "chrome/test/automation/browser_proxy.h" 8 #include "chrome/test/automation/browser_proxy.h"
9 #include "chrome/test/automation/tab_proxy.h" 9 #include "chrome/test/automation/tab_proxy.h"
10 #include "chrome/test/ui/ui_test.h" 10 #include "chrome/test/ui/ui_test.h"
(...skipping 11 matching lines...) Expand all
22 FilePath path_prefix(test_data_directory_.AppendASCII("session_history")); 22 FilePath path_prefix(test_data_directory_.AppendASCII("session_history"));
23 GURL bot1(net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html"))); 23 GURL bot1(net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html")));
24 NavigateToURL(bot1); // To help verify that Home does something. 24 NavigateToURL(bot1); // To help verify that Home does something.
25 25
26 ASSERT_TRUE(Home()); 26 ASSERT_TRUE(Home());
27 27
28 GURL url; 28 GURL url;
29 ASSERT_TRUE(active_browser()->GetActiveTab()->GetCurrentURL(&url)); 29 ASSERT_TRUE(active_browser()->GetActiveTab()->GetCurrentURL(&url));
30 EXPECT_EQ(GURL(chrome::kAboutBlankURL), url); 30 EXPECT_EQ(GURL(chrome::kAboutBlankURL), url);
31 31
32 std::wstring title; 32 string16 title;
33 ASSERT_TRUE(active_browser()->GetActiveTab()->GetTabTitle(&title)); 33 ASSERT_TRUE(active_browser()->GetActiveTab()->GetTabTitle(&title));
34 EXPECT_EQ(L"", title); 34 EXPECT_EQ(string16(), title);
35 } 35 }
36 36
37 TEST_F(AutomatedUITestBase, OpenNewTab) { 37 TEST_F(AutomatedUITestBase, OpenNewTab) {
38 int tab_count; 38 int tab_count;
39 ASSERT_TRUE(active_browser()->GetTabCount(&tab_count)); 39 ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
40 ASSERT_EQ(1, tab_count); 40 ASSERT_EQ(1, tab_count);
41 NewTab(); 41 NewTab();
42 ASSERT_TRUE(active_browser()->GetTabCount(&tab_count)); 42 ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
43 ASSERT_EQ(2, tab_count); 43 ASSERT_EQ(2, tab_count);
44 NewTab(); 44 NewTab();
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url)); 362 ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
363 ASSERT_EQ(GURL(chrome::kChromeUIDownloadsURL), url); 363 ASSERT_EQ(GURL(chrome::kChromeUIDownloadsURL), url);
364 } 364 }
365 365
366 TEST_F(AutomatedUITestBase, ShowHistory) { 366 TEST_F(AutomatedUITestBase, ShowHistory) {
367 ASSERT_TRUE(ShowHistory()); 367 ASSERT_TRUE(ShowHistory());
368 GURL url; 368 GURL url;
369 ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url)); 369 ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
370 ASSERT_EQ(GURL(chrome::kChromeUIHistoryURL), url); 370 ASSERT_EQ(GURL(chrome::kChromeUIHistoryURL), url);
371 } 371 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698