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_frame/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_frame/test_utils.h')
-rw-r--r-- | chrome_frame/test_utils.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h index f07bfbe..6366ad9 100644 --- a/chrome_frame/test_utils.h +++ b/chrome_frame/test_utils.h @@ -12,7 +12,9 @@ #include "base/string16.h" +namespace base { class FilePath; +} extern const wchar_t kChromeFrameDllName[]; extern const wchar_t kChromeLauncherExeName[]; @@ -50,7 +52,7 @@ class ScopedChromeFrameRegistrar { static void UnregisterAtPath(const std::wstring& path, RegistrationType registration_type); static void RegisterDefaults(); - static FilePath GetReferenceChromeFrameDllPath(); + static base::FilePath GetReferenceChromeFrameDllPath(); // Registers or unregisters a COM DLL and exits the process if the process's // command line is: @@ -89,7 +91,7 @@ class ScopedChromeFrameRegistrar { // Returns the path to the Chrome Frame DLL in the build directory. Assumes // that the test executable is running from the build folder or a similar // folder structure. -FilePath GetChromeFrameBuildPath(); +base::FilePath GetChromeFrameBuildPath(); // Callback description for onload, onloaderror, onmessage static _ATL_FUNC_INFO g_single_param = {CC_STDCALL, VT_EMPTY, 1, {VT_VARIANT}}; |