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

Side by Side Diff: chrome/common/chrome_paths.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/test/base/layout_test_http_server.cc » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/common/chrome_paths.h" 5 #include "chrome/common/chrome_paths.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/bundle_locations.h" 10 #include "base/mac/bundle_locations.h"
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 break; 327 break;
328 case chrome::DIR_TEST_TOOLS: 328 case chrome::DIR_TEST_TOOLS:
329 if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur)) 329 if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
330 return false; 330 return false;
331 cur = cur.Append(FILE_PATH_LITERAL("chrome")); 331 cur = cur.Append(FILE_PATH_LITERAL("chrome"));
332 cur = cur.Append(FILE_PATH_LITERAL("tools")); 332 cur = cur.Append(FILE_PATH_LITERAL("tools"));
333 cur = cur.Append(FILE_PATH_LITERAL("test")); 333 cur = cur.Append(FILE_PATH_LITERAL("test"));
334 if (!file_util::PathExists(cur)) // We don't want to create this 334 if (!file_util::PathExists(cur)) // We don't want to create this
335 return false; 335 return false;
336 break; 336 break;
337 case chrome::DIR_LAYOUT_TESTS:
338 if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
339 return false;
340 cur = cur.Append(FILE_PATH_LITERAL("third_party"));
341 cur = cur.Append(FILE_PATH_LITERAL("WebKit"));
342 cur = cur.Append(FILE_PATH_LITERAL("LayoutTests"));
343 if (file_util::DirectoryExists(cur))
344 break;
345 if (!PathService::Get(chrome::DIR_TEST_DATA, &cur))
346 return false;
347 cur = cur.Append(FILE_PATH_LITERAL("layout_tests"));
348 cur = cur.Append(FILE_PATH_LITERAL("LayoutTests"));
349 break;
350 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) 337 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
351 case chrome::DIR_POLICY_FILES: { 338 case chrome::DIR_POLICY_FILES: {
352 #if defined(GOOGLE_CHROME_BUILD) 339 #if defined(GOOGLE_CHROME_BUILD)
353 cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); 340 cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
354 #else 341 #else
355 cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); 342 cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
356 #endif 343 #endif
357 break; 344 break;
358 } 345 }
359 #endif 346 #endif
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 return true; 422 return true;
436 } 423 }
437 424
438 // This cannot be done as a static initializer sadly since Visual Studio will 425 // This cannot be done as a static initializer sadly since Visual Studio will
439 // eliminate this object file if there is no direct entry point into it. 426 // eliminate this object file if there is no direct entry point into it.
440 void RegisterPathProvider() { 427 void RegisterPathProvider() {
441 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); 428 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
442 } 429 }
443 430
444 } // namespace chrome 431 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/test/base/layout_test_http_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698