diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
commit | a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e (patch) | |
tree | bdd4dac76e6034ef6cf33450e203269a715ea0e6 /chrome/test/base/ui_test_utils.h | |
parent | 8bc574c57115e9ffd0169f33131c0865997dcb35 (diff) | |
download | chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.zip chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.gz chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.bz2 |
Add FilePath to base namespace.
This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes.
Review URL: https://codereview.chromium.org/12163003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/ui_test_utils.h')
-rw-r--r-- | chrome/test/base/ui_test_utils.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h index 603419c..fd5cc18 100644 --- a/chrome/test/base/ui_test_utils.h +++ b/chrome/test/base/ui_test_utils.h @@ -29,12 +29,15 @@ class AppModalDialog; class BookmarkModel; class Browser; -class FilePath; class LocationBar; class Profile; class SkBitmap; class TemplateURLService; +namespace base { +class FilePath; +} + namespace chrome { struct NavigateParams; } @@ -107,17 +110,18 @@ void NavigateToURLBlockUntilNavigationsComplete(Browser* browser, // Generate the file path for testing a particular test. // The file for the tests is all located in // test_root_directory/dir/<file> -// The returned path is FilePath format. -FilePath GetTestFilePath(const FilePath& dir, const FilePath& file); +// The returned path is base::FilePath format. +base::FilePath GetTestFilePath(const base::FilePath& dir, + const base::FilePath& file); // Generate the URL for testing a particular test. // HTML for the tests is all located in // test_root_directory/dir/<file> // The returned path is GURL format. -GURL GetTestUrl(const FilePath& dir, const FilePath& file); +GURL GetTestUrl(const base::FilePath& dir, const base::FilePath& file); // Generate the path of the build directory, relative to the source root. -bool GetRelativeBuildDirectory(FilePath* build_dir); +bool GetRelativeBuildDirectory(base::FilePath* build_dir); // Blocks until an application modal dialog is showns and returns it. AppModalDialog* WaitForAppModalDialog(); @@ -275,12 +279,12 @@ bool TakeEntirePageSnapshot(content::RenderViewHost* rvh, // Saves a snapshot of the entire screen to a file named // ChromiumSnapshotYYYYMMDDHHMMSS.png to |directory|, returning true on success. // The path to the file produced is returned in |screenshot_path| if non-NULL. -bool SaveScreenSnapshotToDirectory(const FilePath& directory, - FilePath* screenshot_path); +bool SaveScreenSnapshotToDirectory(const base::FilePath& directory, + base::FilePath* screenshot_path); // Saves a snapshot of the entire screen as above to the current user's desktop. // The Chrome path provider must be registered prior to calling this function. -bool SaveScreenSnapshotToDesktop(FilePath* screenshot_path); +bool SaveScreenSnapshotToDesktop(base::FilePath* screenshot_path); #endif // Configures the geolocation provider to always return the given position. |