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

Unified Diff: content/shell/shell_browser_main.cc

Issue 10824351: [content shell] Add support for layout tests using content_shell on Android (first step). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/shell/layout_test_controller_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_browser_main.cc
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc
index 62f1fb17c2103e2dfa706e5fac3b41314f6800b9..8628d955bc5294a4ea54e9beded17a4f02be3919 100644
--- a/content/shell/shell_browser_main.cc
+++ b/content/shell/shell_browser_main.cc
@@ -20,12 +20,6 @@ namespace {
GURL GetURLForLayoutTest(const char* test_name,
std::string* expected_pixel_hash) {
-#if defined(OS_ANDROID)
- // DumpRenderTree is not currently supported for Android using the content
- // shell.
- NOTIMPLEMENTED();
- return GURL::EmptyGURL();
-#else
std::string path_or_url = test_name;
std::string pixel_hash;
std::string::size_type separator_position = path_or_url.find('\'');
@@ -42,7 +36,6 @@ GURL GetURLForLayoutTest(const char* test_name,
webkit_support::SetCurrentDirectoryForFileURL(test_url);
}
return test_url;
-#endif
}
} // namespace
@@ -71,6 +64,11 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) {
static_cast<content::ShellContentBrowserClient*>(
content::GetContentClient()->browser())->browser_context();
+#if defined(OS_ANDROID)
+ puts("#READY");
+ fflush(stdout);
+#endif
+
while (fgets(test_string, sizeof(test_string), stdin)) {
char *new_line_position = strchr(test_string, '\n');
if (new_line_position)
« no previous file with comments | « content/shell/layout_test_controller_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698