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

Unified Diff: chrome/test/automation/automation_proxy_uitest.cc

Issue 5572001: Send screenshots back to the client for debugging (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: need to push again to make sure rietveld didn't screw up Created 9 years, 9 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 | « chrome/test/automation/automation_json_requests.cc ('k') | chrome/test/automation/tab_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/automation_proxy_uitest.cc
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 7eff4eb5c7d763b24ecc5ad8dd043d3e497ba3bd..abf8daeeac4982a543e8f2ef0b06479b1a75c9a9 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -1620,40 +1620,6 @@ class AutomationProxySnapshotTest : public UITest {
// See http://crbug.com/63022.
#if defined(OS_LINUX)
-#define MAYBE_ContentSmallerThanView FAILS_ContentSmallerThanView
-#else
-#define MAYBE_ContentSmallerThanView ContentSmallerThanView
-#endif
-// Tests that taking a snapshot when the content is smaller than the view
-// produces a snapshot equal to the view size.
-TEST_F(AutomationProxySnapshotTest, MAYBE_ContentSmallerThanView) {
- scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
- ASSERT_TRUE(browser.get());
-
- scoped_refptr<WindowProxy> window(browser->GetWindow());
- ASSERT_TRUE(window.get());
- ASSERT_TRUE(window->SetBounds(gfx::Rect(300, 400)));
-
- scoped_refptr<TabProxy> tab(browser->GetTab(0));
- ASSERT_TRUE(tab.get());
-
- ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
- tab->NavigateToURL(GURL(chrome::kAboutBlankURL)));
-
- gfx::Rect view_bounds;
- ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER, &view_bounds,
- false));
-
- ASSERT_TRUE(tab->CaptureEntirePageAsPNG(snapshot_path_));
-
- SkBitmap bitmap;
- ASSERT_NO_FATAL_FAILURE(AssertReadPNG(snapshot_path_, &bitmap));
- ASSERT_EQ(view_bounds.width(), bitmap.width());
- ASSERT_EQ(view_bounds.height(), bitmap.height());
-}
-
-// See http://crbug.com/63022.
-#if defined(OS_LINUX)
#define MAYBE_ContentLargerThanView FAILS_ContentLargerThanView
#else
#define MAYBE_ContentLargerThanView ContentLargerThanView
« no previous file with comments | « chrome/test/automation/automation_json_requests.cc ('k') | chrome/test/automation/tab_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698