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

Unified Diff: chrome/browser/google_apis/test_util.h

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/browser/google_apis/mock_drive_service.h ('k') | chrome/browser/google_apis/time_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google_apis/test_util.h
diff --git a/chrome/browser/google_apis/test_util.h b/chrome/browser/google_apis/test_util.h
index e0ba436be585eaeff2899f164557535647d998a0..38a10517fd416957f6115341d050d92d868d83ac 100644
--- a/chrome/browser/google_apis/test_util.h
+++ b/chrome/browser/google_apis/test_util.h
@@ -11,9 +11,8 @@
#include "chrome/browser/google_apis/gdata_errorcode.h"
#include "googleurl/src/gurl.h"
-class FilePath;
-
namespace base {
+class FilePath;
class Value;
}
@@ -42,7 +41,7 @@ void RunBlockingPoolTask();
// Returns the absolute path for a test file stored under
// chrome/test/data/chromeos.
-FilePath GetTestFilePath(const std::string& relative_path);
+base::FilePath GetTestFilePath(const std::string& relative_path);
// Returns the base URL for communicating with the local test server for
// testing, running at the specified port number.
@@ -103,13 +102,13 @@ void CopyResultsFromGetAppListCallback(
// Copies the results from DownloadActionCallback.
void CopyResultsFromDownloadActionCallback(
GDataErrorCode* error_out,
- FilePath* temp_file_out,
+ base::FilePath* temp_file_out,
GDataErrorCode error_in,
- const FilePath& temp_file_in);
+ const base::FilePath& temp_file_in);
// Returns a HttpResponse created from the given file path.
scoped_ptr<test_server::HttpResponse> CreateHttpResponseFromFile(
- const FilePath& file_path);
+ const base::FilePath& file_path);
// Does nothing for ReAuthenticateCallback(). This function should be used
// if it is not expected to reach this method as there won't be any
@@ -120,7 +119,7 @@ void DoNothingForReAuthenticateCallback(
// Returns true if |json_data| is not NULL and equals to the content in
// |expected_json_file_path|. The failure reason will be logged into LOG(ERROR)
// if necessary.
-bool VerifyJsonData(const FilePath& expected_json_file_path,
+bool VerifyJsonData(const base::FilePath& expected_json_file_path,
const base::Value* json_data);
} // namespace test_util
« no previous file with comments | « chrome/browser/google_apis/mock_drive_service.h ('k') | chrome/browser/google_apis/time_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698