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

Unified Diff: content/browser/in_process_webkit/dom_storage_uitest.cc

Issue 9820005: Move PathService's DIR_LAYOUT_TESTS from chrome to content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove indexed_db_uitest changes Created 8 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/ui/ui_layout_test.cc ('k') | content/common/content_paths.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/in_process_webkit/dom_storage_uitest.cc
diff --git a/content/browser/in_process_webkit/dom_storage_uitest.cc b/content/browser/in_process_webkit/dom_storage_uitest.cc
index d1a338f8d17732b8d09b3c0632741ddeba0e09e2..aac6796ebb48c0115e099190b6b4e059c4382535 100644
--- a/content/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/content/browser/in_process_webkit/dom_storage_uitest.cc
@@ -4,10 +4,11 @@
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/path_service.h"
#include "base/test/test_timeouts.h"
#include "chrome/test/automation/tab_proxy.h"
-#include "chrome/test/base/ui_test_utils.h"
#include "chrome/test/ui/ui_layout_test.h"
+#include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h"
#include "net/base/net_util.h"
#include "webkit/dom_storage/dom_storage_types.h"
@@ -78,9 +79,11 @@ class DOMStorageTest : public UILayoutTest {
scoped_refptr<TabProxy> tab(GetActiveTab());
ASSERT_TRUE(tab.get());
- const FilePath dir(FILE_PATH_LITERAL("layout_tests"));
- const FilePath file(FILE_PATH_LITERAL("clear_dom_storage.html"));
- GURL url = ui_test_utils::GetTestUrl(dir, file);
+ FilePath dir;
+ PathService::Get(content::DIR_TEST_DATA, &dir);
+ GURL url = net::FilePathToFileURL(
+ dir.AppendASCII("layout_tests").AppendASCII("clear_dom_storage.html"));
+
ASSERT_TRUE(tab->SetCookie(url, ""));
ASSERT_TRUE(tab->NavigateToURL(url));
« no previous file with comments | « chrome/test/ui/ui_layout_test.cc ('k') | content/common/content_paths.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698