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

Unified Diff: chromeos/disks/mock_disk_mount_manager.cc

Issue 10874067: chromeos: Move src/chrome/browser/chromeos/disks to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « chromeos/disks/mock_disk_mount_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/disks/mock_disk_mount_manager.cc
diff --git a/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc b/chromeos/disks/mock_disk_mount_manager.cc
similarity index 95%
rename from chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
rename to chromeos/disks/mock_disk_mount_manager.cc
index de08ebed8e0311b8d95bb1c59bcc6e8e04d1c272..0b67c9a732d3c752c18132c7a243ea32648fb54c 100644
--- a/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
+++ b/chromeos/disks/mock_disk_mount_manager.cc
@@ -2,16 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/disks/mock_disk_mount_manager.h"
+#include "chromeos/disks/mock_disk_mount_manager.h"
#include <utility>
#include "base/message_loop.h"
#include "base/stl_util.h"
#include "base/string_util.h"
-#include "content/public/browser/browser_thread.h"
-using content::BrowserThread;
using testing::_;
using testing::AnyNumber;
using testing::Invoke;
@@ -217,17 +215,11 @@ MockDiskMountManager::FindDiskBySourcePathInternal(
void MockDiskMountManager::NotifyDiskChanged(
DiskMountManagerEventType event,
const DiskMountManager::Disk* disk) {
- // Make sure we run on UI thread.
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
FOR_EACH_OBSERVER(Observer, observers_, DiskChanged(event, disk));
}
void MockDiskMountManager::NotifyDeviceChanged(DiskMountManagerEventType event,
const std::string& path) {
- // Make sure we run on UI thread.
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
FOR_EACH_OBSERVER(Observer, observers_, DeviceChanged(event, path));
}
« no previous file with comments | « chromeos/disks/mock_disk_mount_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698