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

Unified Diff: content/test/layout_browsertest.cc

Issue 11346016: Move remaining content test code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/layout_browsertest.h ('k') | content/test/layout_test_http_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/layout_browsertest.cc
===================================================================
--- content/test/layout_browsertest.cc (revision 164732)
+++ content/test/layout_browsertest.cc (working copy)
@@ -39,6 +39,7 @@
#error No known OS defined
#endif
+namespace content {
namespace {
bool ReadExpectedResult(const FilePath& result_dir_path,
@@ -75,7 +76,7 @@
void InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture() {
FilePath src_dir;
- ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &src_dir));
+ ASSERT_TRUE(PathService::Get(DIR_LAYOUT_TESTS, &src_dir));
FilePath absolute_parent_dir = src_dir.Append(test_parent_dir_);
ASSERT_TRUE(file_util::DirectoryExists(absolute_parent_dir));
layout_test_dir_ = absolute_parent_dir.Append(test_case_dir_);
@@ -124,7 +125,7 @@
}
void InProcessBrowserLayoutTest::SetUpOnMainThread() {
- test_controller_.reset(new content::WebKitTestController);
+ test_controller_.reset(new WebKitTestController);
}
void InProcessBrowserLayoutTest::RunLayoutTest(
@@ -146,8 +147,8 @@
void InProcessBrowserLayoutTest::RunLayoutTestInternal(
const std::string& test_case_file_name, const GURL& url) {
std::stringstream result;
- scoped_ptr<content::WebKitTestResultPrinter> printer(
- new content::WebKitTestResultPrinter(&result, NULL));
+ scoped_ptr<WebKitTestResultPrinter> printer(
+ new WebKitTestResultPrinter(&result, NULL));
printer->set_capture_text_only(true);
test_controller_->set_printer(printer.release());
@@ -204,3 +205,5 @@
expected_filename.value().c_str(),
actual_filename.value().c_str());
}
+
+} // namespace content
« no previous file with comments | « content/test/layout_browsertest.h ('k') | content/test/layout_test_http_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698