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

Unified Diff: chrome/browser/system_monitor/test_volume_mount_watcher_win.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
Index: chrome/browser/system_monitor/test_volume_mount_watcher_win.h
diff --git a/chrome/browser/system_monitor/test_volume_mount_watcher_win.h b/chrome/browser/system_monitor/test_volume_mount_watcher_win.h
index 0771d70ca4167f5600c8e4a09123fe970515d6da..a4b722719260a5fb32b0562bc6bff08798f8596d 100644
--- a/chrome/browser/system_monitor/test_volume_mount_watcher_win.h
+++ b/chrome/browser/system_monitor/test_volume_mount_watcher_win.h
@@ -15,7 +15,9 @@
#include "base/synchronization/waitable_event.h"
#include "chrome/browser/system_monitor/volume_mount_watcher_win.h"
+namespace base {
class FilePath;
+}
namespace chrome {
namespace test {
@@ -25,7 +27,7 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {
TestVolumeMountWatcherWin();
virtual ~TestVolumeMountWatcherWin();
- void AddDeviceForTesting(const FilePath& device_path,
+ void AddDeviceForTesting(const base::FilePath& device_path,
const std::string& device_id,
const std::string& unique_id,
const string16& device_name,
@@ -35,30 +37,30 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {
void FlushWorkerPoolForTesting();
- virtual void DeviceCheckComplete(const FilePath& device_path);
+ virtual void DeviceCheckComplete(const base::FilePath& device_path);
- std::vector<FilePath> devices_checked() const { return devices_checked_; }
+ std::vector<base::FilePath> devices_checked() const { return devices_checked_; }
void BlockDeviceCheckForTesting();
void ReleaseDeviceCheck();
// VolumeMountWatcherWin:
- virtual bool GetDeviceInfo(const FilePath& device_path,
+ virtual bool GetDeviceInfo(const base::FilePath& device_path,
string16* device_location,
std::string* unique_id,
string16* name,
bool* removable) const OVERRIDE;
- virtual std::vector<FilePath> GetAttachedDevices();
+ virtual std::vector<base::FilePath> GetAttachedDevices();
- bool GetRawDeviceInfo(const FilePath& device_path,
+ bool GetRawDeviceInfo(const base::FilePath& device_path,
string16* device_location,
std::string* unique_id,
string16* name,
bool* removable);
private:
- std::vector<FilePath> devices_checked_;
+ std::vector<base::FilePath> devices_checked_;
scoped_ptr<base::WaitableEvent> device_check_complete_event_;
DISALLOW_COPY_AND_ASSIGN(TestVolumeMountWatcherWin);

Powered by Google App Engine
This is Rietveld 408576698