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

Unified Diff: webkit/glue/iframe_redirect_unittest.cc

Issue 10536207: Remove layoutTestController from test_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: really fix mac Created 8 years, 6 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 | « webkit/data/test_shell/iframe_redirect/main.html ('k') | webkit/tools/test_shell/layout_test_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/iframe_redirect_unittest.cc
diff --git a/webkit/glue/iframe_redirect_unittest.cc b/webkit/glue/iframe_redirect_unittest.cc
deleted file mode 100644
index 0c3904ab38843691a296db62f37fac5669c48499..0000000000000000000000000000000000000000
--- a/webkit/glue/iframe_redirect_unittest.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <string>
-
-#include "base/file_util.h"
-#include "base/string_util.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/webkit_glue.h"
-#include "webkit/tools/test_shell/test_shell_test.h"
-
-using WebKit::WebDataSource;
-using WebKit::WebFrame;
-using WebKit::WebString;
-using WebKit::WebURL;
-using WebKit::WebVector;
-
-typedef TestShellTest IFrameRedirectTest;
-
-// Tests that loading a page in an iframe from javascript results in
-// a redirect from about:blank.
-TEST_F(IFrameRedirectTest, Test) {
- FilePath iframes_data_dir_ = data_dir_;
- iframes_data_dir_ = iframes_data_dir_.AppendASCII("test_shell");
- iframes_data_dir_ = iframes_data_dir_.AppendASCII("iframe_redirect");
- ASSERT_TRUE(file_util::PathExists(iframes_data_dir_));
-
- GURL test_url = GetTestURL(iframes_data_dir_, "main.html");
-
- test_shell_->LoadURL(test_url);
- test_shell_->WaitTestFinished();
-
- WebFrame* iframe =
- test_shell_->webView()->findFrameByName(WebString::fromUTF8("ifr"));
- ASSERT_TRUE(iframe != NULL);
- WebDataSource* iframe_ds = iframe->dataSource();
- ASSERT_TRUE(iframe_ds != NULL);
- WebVector<WebURL> redirects;
- iframe_ds->redirectChain(redirects);
- ASSERT_FALSE(redirects.isEmpty());
- ASSERT_TRUE(GURL(redirects[0]) == GURL("about:blank"));
-}
« no previous file with comments | « webkit/data/test_shell/iframe_redirect/main.html ('k') | webkit/tools/test_shell/layout_test_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698