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

Side by Side Diff: webkit/tools/test_shell/test_shell_gtk.cc

Issue 192064: Hack to make tests work if out is a symlink: see if the current dir is the source root. (Closed)
Patch Set: use path.DirName().DirName() Created 11 years, 3 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 unified diff | Download patch
« no previous file with comments | « chrome/test/tab_switching/tab_switching_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/tools/test_shell/test_shell.h" 5 #include "webkit/tools/test_shell/test_shell.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <fontconfig/fontconfig.h> 9 #include <fontconfig/fontconfig.h>
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 622
623 // static 623 // static
624 std::string TestShell::RewriteLocalUrl(const std::string& url) { 624 std::string TestShell::RewriteLocalUrl(const std::string& url) {
625 // Convert file:///tmp/LayoutTests urls to the actual location on disk. 625 // Convert file:///tmp/LayoutTests urls to the actual location on disk.
626 const char kPrefix[] = "file:///tmp/LayoutTests/"; 626 const char kPrefix[] = "file:///tmp/LayoutTests/";
627 const int kPrefixLen = arraysize(kPrefix) - 1; 627 const int kPrefixLen = arraysize(kPrefix) - 1;
628 628
629 std::string new_url(url); 629 std::string new_url(url);
630 if (url.compare(0, kPrefixLen, kPrefix, kPrefixLen) == 0) { 630 if (url.compare(0, kPrefixLen, kPrefix, kPrefixLen) == 0) {
631 FilePath replace_path; 631 FilePath replace_path;
632 PathService::Get(base::DIR_EXE, &replace_path); 632 PathService::Get(base::DIR_SOURCE_ROOT, &replace_path);
633 replace_path = replace_path.DirName().DirName().Append( 633 replace_path = replace_path.Append(
634 "webkit/data/layout_tests/LayoutTests/"); 634 "webkit/data/layout_tests/LayoutTests/");
635 new_url = std::string("file://") + replace_path.value() + 635 new_url = std::string("file://") + replace_path.value() +
636 url.substr(kPrefixLen); 636 url.substr(kPrefixLen);
637 } 637 }
638 638
639 return new_url; 639 return new_url;
640 } 640 }
641 641
642 // static 642 // static
643 void TestShell::ShowStartupDebuggingDialog() { 643 void TestShell::ShowStartupDebuggingDialog() {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 break; 686 break;
687 } 687 }
688 return TestShell::NetResourceProvider(resource_id); 688 return TestShell::NetResourceProvider(resource_id);
689 } 689 }
690 690
691 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { 691 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
692 NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); 692 NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
693 } 693 }
694 694
695 } // namespace webkit_glue 695 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « chrome/test/tab_switching/tab_switching_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698