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

Side by Side Diff: content/test/content_browser_test_test.cc

Issue 10806056: Move plugin_browsertests.cc from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to mac+win fixes Created 8 years, 5 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 "content/test/content_browser_test.h" 5 #include "content/test/content_browser_test.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "content/public/test/browser_test_utils.h" 8 #include "content/public/test/browser_test_utils.h"
9 #include "content/shell/shell.h" 9 #include "content/shell/shell.h"
10 #include "content/test/content_browser_test_utils.h" 10 #include "content/test/content_browser_test_utils.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, Basic) { 15 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, Basic) {
16 GURL url = GetTestUrl(("."), "simple_page.html"); 16 GURL url = GetTestUrl(".", "simple_page.html");
17 17
18 string16 expected_title(ASCIIToUTF16("Simple Page")); 18 string16 expected_title(ASCIIToUTF16("OK"));
19 TitleWatcher title_watcher(shell()->web_contents(), expected_title); 19 TitleWatcher title_watcher(shell()->web_contents(), expected_title);
20 NavigateToURL(shell(), url); 20 NavigateToURL(shell(), url);
21 string16 title = title_watcher.WaitAndGetTitle(); 21 string16 title = title_watcher.WaitAndGetTitle();
22 EXPECT_EQ(expected_title, title); 22 EXPECT_EQ(expected_title, title);
23 } 23 }
24 24
25 } // namespace content 25 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698