Rename source files to be more consistent with other projects.
BUG=None
TEST=Tested the following:
1. Build and run unit tests.
2. Run the following tests:
- platform_CrosDisksDBus
- platform_CrosDisksFilesystem
- platform_CrosDisksArchive
- platform_CrosDisksFormat
Change-Id: Ic809bea9fcd22cedd45daf055e78e71c01c84514
Reviewed-on: https://chromium-review.googlesource.com/176744
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
diff --git a/archive-manager.cc b/archive_manager.cc
similarity index 98%
rename from archive-manager.cc
rename to archive_manager.cc
index 3437889..a80fc88 100644
--- a/archive-manager.cc
+++ b/archive_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/archive-manager.h"
+#include "cros-disks/archive_manager.h"
#include <linux/capability.h>
@@ -14,11 +14,11 @@
#include <chromeos/cryptohome.h>
#include "cros-disks/metrics.h"
-#include "cros-disks/mount-info.h"
-#include "cros-disks/mount-options.h"
+#include "cros-disks/mount_info.h"
+#include "cros-disks/mount_options.h"
#include "cros-disks/platform.h"
-#include "cros-disks/sandboxed-process.h"
-#include "cros-disks/system-mounter.h"
+#include "cros-disks/sandboxed_process.h"
+#include "cros-disks/system_mounter.h"
using base::FilePath;
using std::map;
diff --git a/archive-manager.h b/archive_manager.h
similarity index 99%
rename from archive-manager.h
rename to archive_manager.h
index 6544c87..77e1348 100644
--- a/archive-manager.h
+++ b/archive_manager.h
@@ -11,7 +11,7 @@
#include <gtest/gtest_prod.h>
-#include "cros-disks/mount-manager.h"
+#include "cros-disks/mount_manager.h"
namespace cros_disks {
diff --git a/archive-manager_unittest.cc b/archive_manager_unittest.cc
similarity index 99%
rename from archive-manager_unittest.cc
rename to archive_manager_unittest.cc
index 7eef5d9..133d523 100644
--- a/archive-manager_unittest.cc
+++ b/archive_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/archive-manager.h"
+#include "cros-disks/archive_manager.h"
#include <gtest/gtest.h>
diff --git a/cros-disks.gyp b/cros-disks.gyp
index f935e78..a3f56ae 100644
--- a/cros-disks.gyp
+++ b/cros-disks.gyp
@@ -28,10 +28,11 @@
'type': 'none',
'variables': {
'xml2cpp_type': 'adaptor',
- 'xml2cpp_out_dir': 'include/cros-disks',
+ 'xml2cpp_in_dir': 'dbus_bindings',
+ 'xml2cpp_out_dir': 'include/cros-disks/dbus_adaptors',
},
'sources': [
- 'cros-disks-server.xml',
+ '<(xml2cpp_in_dir)/org.chromium.CrosDisks.xml',
],
'includes': ['../common-mk/xml2cpp.gypi'],
},
@@ -40,35 +41,35 @@
'type': 'static_library',
'dependencies': ['libdisks-adaptors'],
'sources': [
- 'archive-manager.cc',
- 'cros-disks-server-impl.cc',
+ 'archive_manager.cc',
+ 'cros_disks_server.cc',
'daemon.cc',
- 'device-ejector.cc',
- 'device-event-moderator.cc',
- 'device-event-queue.cc',
- 'device-event.cc',
- 'disk-manager.cc',
+ 'device_ejector.cc',
+ 'device_event.cc',
+ 'device_event_moderator.cc',
+ 'device_event_queue.cc',
'disk.cc',
- 'exfat-mounter.cc',
- 'external-mounter.cc',
- 'file-reader.cc',
+ 'disk_manager.cc',
+ 'exfat_mounter.cc',
+ 'external_mounter.cc',
+ 'file_reader.cc',
'filesystem.cc',
- 'format-manager.cc',
- 'fuse-mounter.cc',
- 'glib-process.cc',
+ 'format_manager.cc',
+ 'fuse_mounter.cc',
+ 'glib_process.cc',
'metrics.cc',
- 'mount-info.cc',
- 'mount-manager.cc',
- 'mount-options.cc',
+ 'mount_info.cc',
+ 'mount_manager.cc',
+ 'mount_options.cc',
'mounter.cc',
- 'ntfs-mounter.cc',
+ 'ntfs_mounter.cc',
'platform.cc',
'process.cc',
- 'sandboxed-process.cc',
- 'session-manager-proxy.cc',
- 'system-mounter.cc',
- 'udev-device.cc',
- 'usb-device-info.cc',
+ 'sandboxed_process.cc',
+ 'session_manager_proxy.cc',
+ 'system_mounter.cc',
+ 'udev_device.cc',
+ 'usb_device_info.cc',
],
},
{
@@ -89,26 +90,26 @@
'dependencies': ['libdisks'],
'includes': ['../common-mk/common_test.gypi'],
'sources': [
- 'archive-manager_unittest.cc',
- 'device-event-moderator_unittest.cc',
- 'device-event-queue_unittest.cc',
- 'disk-manager_unittest.cc',
- 'external-mounter_unittest.cc',
+ 'archive_manager_unittest.cc',
+ 'device_event_moderator_unittest.cc',
+ 'device_event_queue_unittest.cc',
+ 'disk_manager_unittest.cc',
'disk_unittest.cc',
'disks_testrunner.cc',
- 'file-reader_unittest.cc',
- 'format-manager_unittest.cc',
- 'glib-process_unittest.cc',
+ 'external_mounter_unittest.cc',
+ 'file_reader_unittest.cc',
+ 'format_manager_unittest.cc',
+ 'glib_process_unittest.cc',
'metrics_unittest.cc',
- 'mount-info_unittest.cc',
- 'mount-manager_unittest.cc',
- 'mount-options_unittest.cc',
+ 'mount_info_unittest.cc',
+ 'mount_manager_unittest.cc',
+ 'mount_options_unittest.cc',
'mounter_unittest.cc',
'platform_unittest.cc',
'process_unittest.cc',
- 'system-mounter_unittest.cc',
- 'udev-device_unittest.cc',
- 'usb-device-info_unittest.cc',
+ 'system_mounter_unittest.cc',
+ 'udev_device_unittest.cc',
+ 'usb_device_info_unittest.cc',
]
},
],
diff --git a/cros-disks-server-impl.cc b/cros_disks_server.cc
similarity index 97%
rename from cros-disks-server-impl.cc
rename to cros_disks_server.cc
index f541e40..d13a191 100644
--- a/cros-disks-server-impl.cc
+++ b/cros_disks_server.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/cros-disks-server-impl.h"
+#include "cros-disks/cros_disks_server.h"
#include <base/logging.h>
#include <chromeos/dbus/service_constants.h>
-#include "cros-disks/archive-manager.h"
-#include "cros-disks/device-event.h"
+#include "cros-disks/archive_manager.h"
+#include "cros-disks/device_event.h"
#include "cros-disks/disk.h"
-#include "cros-disks/disk-manager.h"
-#include "cros-disks/format-manager.h"
+#include "cros-disks/disk_manager.h"
+#include "cros-disks/format_manager.h"
#include "cros-disks/platform.h"
using std::string;
diff --git a/cros-disks-server-impl.h b/cros_disks_server.h
similarity index 95%
rename from cros-disks-server-impl.h
rename to cros_disks_server.h
index f2f9295..de2d4eb 100644
--- a/cros-disks-server-impl.h
+++ b/cros_disks_server.h
@@ -8,12 +8,12 @@
#include <string>
#include <vector>
-#include "cros-disks/cros-disks-server.h"
-#include "cros-disks/device-event-dispatcher-interface.h"
-#include "cros-disks/device-event-queue.h"
+#include "cros-disks/dbus_adaptors/org.chromium.CrosDisks.h"
+#include "cros-disks/device_event_dispatcher_interface.h"
+#include "cros-disks/device_event_queue.h"
#include "cros-disks/disk.h"
-#include "cros-disks/format-manager-observer-interface.h"
-#include "cros-disks/session-manager-observer-interface.h"
+#include "cros-disks/format_manager_observer_interface.h"
+#include "cros-disks/session_manager_observer_interface.h"
namespace cros_disks {
diff --git a/daemon.h b/daemon.h
index fe9be6c..26a1fcd 100644
--- a/daemon.h
+++ b/daemon.h
@@ -7,15 +7,15 @@
#include <base/basictypes.h>
-#include "cros-disks/archive-manager.h"
-#include "cros-disks/cros-disks-server-impl.h"
-#include "cros-disks/device-ejector.h"
-#include "cros-disks/device-event-moderator.h"
-#include "cros-disks/disk-manager.h"
-#include "cros-disks/format-manager.h"
+#include "cros-disks/archive_manager.h"
+#include "cros-disks/cros_disks_server.h"
+#include "cros-disks/device_ejector.h"
+#include "cros-disks/device_event_moderator.h"
+#include "cros-disks/disk_manager.h"
+#include "cros-disks/format_manager.h"
#include "cros-disks/metrics.h"
#include "cros-disks/platform.h"
-#include "cros-disks/session-manager-proxy.h"
+#include "cros-disks/session_manager_proxy.h"
namespace cros_disks {
diff --git a/cros-disks-server.xml b/dbus_bindings/org.chromium.CrosDisks.xml
similarity index 100%
rename from cros-disks-server.xml
rename to dbus_bindings/org.chromium.CrosDisks.xml
diff --git a/device-ejector.cc b/device_ejector.cc
similarity index 94%
rename from device-ejector.cc
rename to device_ejector.cc
index de7b2ee..182fd39 100644
--- a/device-ejector.cc
+++ b/device_ejector.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/device-ejector.h"
+#include "cros-disks/device_ejector.h"
#include <base/bind.h>
#include <base/logging.h>
#include <base/stl_util.h>
-#include "cros-disks/glib-process.h"
+#include "cros-disks/glib_process.h"
using std::string;
diff --git a/device-ejector.h b/device_ejector.h
similarity index 100%
rename from device-ejector.h
rename to device_ejector.h
diff --git a/device-event.cc b/device_event.cc
similarity index 93%
rename from device-event.cc
rename to device_event.cc
index 6bc2719..a62661e 100644
--- a/device-event.cc
+++ b/device_event.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/device-event.h"
+#include "cros-disks/device_event.h"
namespace cros_disks {
diff --git a/device-event.h b/device_event.h
similarity index 100%
rename from device-event.h
rename to device_event.h
diff --git a/device-event-dispatcher-interface.h b/device_event_dispatcher_interface.h
similarity index 100%
rename from device-event-dispatcher-interface.h
rename to device_event_dispatcher_interface.h
diff --git a/device-event-moderator.cc b/device_event_moderator.cc
similarity index 93%
rename from device-event-moderator.cc
rename to device_event_moderator.cc
index cbf76c0..9139a21 100644
--- a/device-event-moderator.cc
+++ b/device_event_moderator.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/device-event-moderator.h"
+#include "cros-disks/device_event_moderator.h"
#include <base/logging.h>
-#include "cros-disks/device-event-dispatcher-interface.h"
-#include "cros-disks/device-event-source-interface.h"
+#include "cros-disks/device_event_dispatcher_interface.h"
+#include "cros-disks/device_event_source_interface.h"
using std::string;
diff --git a/device-event-moderator.h b/device_event_moderator.h
similarity index 96%
rename from device-event-moderator.h
rename to device_event_moderator.h
index ad0cb36..f05af2b 100644
--- a/device-event-moderator.h
+++ b/device_event_moderator.h
@@ -9,8 +9,8 @@
#include <base/basictypes.h>
-#include "cros-disks/device-event-queue.h"
-#include "cros-disks/session-manager-observer-interface.h"
+#include "cros-disks/device_event_queue.h"
+#include "cros-disks/session_manager_observer_interface.h"
namespace cros_disks {
diff --git a/device-event-moderator_unittest.cc b/device_event_moderator_unittest.cc
similarity index 96%
rename from device-event-moderator_unittest.cc
rename to device_event_moderator_unittest.cc
index ec3cb06..dae8b06 100644
--- a/device-event-moderator_unittest.cc
+++ b/device_event_moderator_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/device-event-moderator.h"
+#include "cros-disks/device_event_moderator.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "cros-disks/device-event.h"
-#include "cros-disks/device-event-dispatcher-interface.h"
-#include "cros-disks/device-event-source-interface.h"
+#include "cros-disks/device_event.h"
+#include "cros-disks/device_event_dispatcher_interface.h"
+#include "cros-disks/device_event_source_interface.h"
using testing::DoAll;
using testing::InSequence;
diff --git a/device-event-queue.cc b/device_event_queue.cc
similarity index 96%
rename from device-event-queue.cc
rename to device_event_queue.cc
index d7c4258..2b133dd 100644
--- a/device-event-queue.cc
+++ b/device_event_queue.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/device-event-queue.h"
+#include "cros-disks/device_event_queue.h"
#include <base/logging.h>
-#include "cros-disks/device-event.h"
+#include "cros-disks/device_event.h"
namespace cros_disks {
diff --git a/device-event-queue.h b/device_event_queue.h
similarity index 98%
rename from device-event-queue.h
rename to device_event_queue.h
index fe940e6..7c10a3f 100644
--- a/device-event-queue.h
+++ b/device_event_queue.h
@@ -7,7 +7,7 @@
#include <base/basictypes.h>
-#include "cros-disks/device-event.h"
+#include "cros-disks/device_event.h"
namespace cros_disks {
diff --git a/device-event-queue_unittest.cc b/device_event_queue_unittest.cc
similarity index 98%
rename from device-event-queue_unittest.cc
rename to device_event_queue_unittest.cc
index 64ad126..255f15b 100644
--- a/device-event-queue_unittest.cc
+++ b/device_event_queue_unittest.cc
@@ -7,8 +7,8 @@
#include <gtest/gtest.h>
-#include "cros-disks/device-event.h"
-#include "cros-disks/device-event-queue.h"
+#include "cros-disks/device_event.h"
+#include "cros-disks/device_event_queue.h"
namespace cros_disks {
diff --git a/device-event-source-interface.h b/device_event_source_interface.h
similarity index 94%
rename from device-event-source-interface.h
rename to device_event_source_interface.h
index c417771..531457e 100644
--- a/device-event-source-interface.h
+++ b/device_event_source_interface.h
@@ -5,7 +5,7 @@
#ifndef CROS_DISKS_DEVICE_EVENT_SOURCE_INTERFACE_H_
#define CROS_DISKS_DEVICE_EVENT_SOURCE_INTERFACE_H_
-#include "cros-disks/device-event.h"
+#include "cros-disks/device_event.h"
namespace cros_disks {
diff --git a/disk-manager.cc b/disk_manager.cc
similarity index 98%
rename from disk-manager.cc
rename to disk_manager.cc
index 5f2271f..227a8f1 100644
--- a/disk-manager.cc
+++ b/disk_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/disk-manager.h"
+#include "cros-disks/disk_manager.h"
#include <libudev.h>
#include <string.h>
@@ -15,15 +15,15 @@
#include <base/stringprintf.h>
#include "cros-disks/disk.h"
-#include "cros-disks/exfat-mounter.h"
-#include "cros-disks/external-mounter.h"
+#include "cros-disks/exfat_mounter.h"
+#include "cros-disks/external_mounter.h"
#include "cros-disks/filesystem.h"
#include "cros-disks/metrics.h"
-#include "cros-disks/mount-options.h"
-#include "cros-disks/ntfs-mounter.h"
+#include "cros-disks/mount_options.h"
+#include "cros-disks/ntfs_mounter.h"
#include "cros-disks/platform.h"
-#include "cros-disks/system-mounter.h"
-#include "cros-disks/udev-device.h"
+#include "cros-disks/system_mounter.h"
+#include "cros-disks/udev_device.h"
using std::map;
using std::set;
diff --git a/disk-manager.h b/disk_manager.h
similarity index 97%
rename from disk-manager.h
rename to disk_manager.h
index 6a0b4bc..2a85127 100644
--- a/disk-manager.h
+++ b/disk_manager.h
@@ -15,10 +15,10 @@
#include <base/basictypes.h>
#include <gtest/gtest_prod.h>
-#include "cros-disks/device-ejector.h"
-#include "cros-disks/device-event.h"
-#include "cros-disks/device-event-source-interface.h"
-#include "cros-disks/mount-manager.h"
+#include "cros-disks/device_ejector.h"
+#include "cros-disks/device_event.h"
+#include "cros-disks/device_event_source_interface.h"
+#include "cros-disks/mount_manager.h"
namespace cros_disks {
diff --git a/disk-manager_unittest.cc b/disk_manager_unittest.cc
similarity index 98%
rename from disk-manager_unittest.cc
rename to disk_manager_unittest.cc
index 1c25926..6e593ee 100644
--- a/disk-manager_unittest.cc
+++ b/disk_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/disk-manager.h"
+#include "cros-disks/disk_manager.h"
#include <sys/mount.h>
@@ -13,14 +13,14 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "cros-disks/device-ejector.h"
+#include "cros-disks/device_ejector.h"
#include "cros-disks/disk.h"
-#include "cros-disks/exfat-mounter.h"
-#include "cros-disks/external-mounter.h"
+#include "cros-disks/exfat_mounter.h"
+#include "cros-disks/external_mounter.h"
#include "cros-disks/filesystem.h"
#include "cros-disks/metrics.h"
#include "cros-disks/mounter.h"
-#include "cros-disks/ntfs-mounter.h"
+#include "cros-disks/ntfs_mounter.h"
#include "cros-disks/platform.h"
using std::map;
diff --git a/exfat-mounter.cc b/exfat_mounter.cc
similarity index 95%
rename from exfat-mounter.cc
rename to exfat_mounter.cc
index c1450c9..f8e454d 100644
--- a/exfat-mounter.cc
+++ b/exfat_mounter.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/exfat-mounter.h"
+#include "cros-disks/exfat_mounter.h"
#include "cros-disks/platform.h"
diff --git a/exfat-mounter.h b/exfat_mounter.h
similarity index 95%
rename from exfat-mounter.h
rename to exfat_mounter.h
index 16e3564..e548fc1 100644
--- a/exfat-mounter.h
+++ b/exfat_mounter.h
@@ -7,7 +7,7 @@
#include <string>
-#include "cros-disks/fuse-mounter.h"
+#include "cros-disks/fuse_mounter.h"
namespace cros_disks {
diff --git a/external-mounter.cc b/external_mounter.cc
similarity index 97%
rename from external-mounter.cc
rename to external_mounter.cc
index 4b7246a..6995c37 100644
--- a/external-mounter.cc
+++ b/external_mounter.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/external-mounter.h"
+#include "cros-disks/external_mounter.h"
#include <string>
diff --git a/external-mounter.h b/external_mounter.h
similarity index 100%
rename from external-mounter.h
rename to external_mounter.h
diff --git a/external-mounter_unittest.cc b/external_mounter_unittest.cc
similarity index 96%
rename from external-mounter_unittest.cc
rename to external_mounter_unittest.cc
index cf2eda6..6c81cbb 100644
--- a/external-mounter_unittest.cc
+++ b/external_mounter_unittest.cc
@@ -11,8 +11,8 @@
#include <base/logging.h>
#include <gtest/gtest.h>
-#include "cros-disks/external-mounter.h"
-#include "cros-disks/mount-options.h"
+#include "cros-disks/external_mounter.h"
+#include "cros-disks/mount_options.h"
using std::string;
using std::vector;
diff --git a/file-reader.cc b/file_reader.cc
similarity index 95%
rename from file-reader.cc
rename to file_reader.cc
index 30904cc..7ac3fb6 100644
--- a/file-reader.cc
+++ b/file_reader.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/file-reader.h"
+#include "cros-disks/file_reader.h"
using base::FilePath;
using std::string;
diff --git a/file-reader.h b/file_reader.h
similarity index 100%
rename from file-reader.h
rename to file_reader.h
diff --git a/file-reader_unittest.cc b/file_reader_unittest.cc
similarity index 98%
rename from file-reader_unittest.cc
rename to file_reader_unittest.cc
index dac5ac8..fbe09f2 100644
--- a/file-reader_unittest.cc
+++ b/file_reader_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/file-reader.h"
+#include "cros-disks/file_reader.h"
#include <string>
#include <vector>
diff --git a/format-manager.cc b/format_manager.cc
similarity index 97%
rename from format-manager.cc
rename to format_manager.cc
index 4783c31..62fbc48 100644
--- a/format-manager.cc
+++ b/format_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/format-manager.h"
+#include "cros-disks/format_manager.h"
#include <glib.h>
#include <map>
@@ -13,7 +13,7 @@
#include <base/stl_util.h>
#include <chromeos/process.h>
-#include "cros-disks/format-manager-observer-interface.h"
+#include "cros-disks/format_manager_observer_interface.h"
using base::FilePath;
using std::string;
diff --git a/format-manager.h b/format_manager.h
similarity index 100%
rename from format-manager.h
rename to format_manager.h
diff --git a/format-manager-observer-interface.h b/format_manager_observer_interface.h
similarity index 100%
rename from format-manager-observer-interface.h
rename to format_manager_observer_interface.h
diff --git a/format-manager_unittest.cc b/format_manager_unittest.cc
similarity index 94%
rename from format-manager_unittest.cc
rename to format_manager_unittest.cc
index 1540b30..1641b97 100644
--- a/format-manager_unittest.cc
+++ b/format_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/format-manager.h"
+#include "cros-disks/format_manager.h"
#include <gtest/gtest.h>
diff --git a/fuse-mounter.cc b/fuse_mounter.cc
similarity index 97%
rename from fuse-mounter.cc
rename to fuse_mounter.cc
index 94ffa22..590eb59 100644
--- a/fuse-mounter.cc
+++ b/fuse_mounter.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/fuse-mounter.h"
+#include "cros-disks/fuse_mounter.h"
#include <linux/capability.h>
@@ -12,7 +12,7 @@
#include <base/logging.h>
#include "cros-disks/platform.h"
-#include "cros-disks/sandboxed-process.h"
+#include "cros-disks/sandboxed_process.h"
using base::FilePath;
using std::string;
diff --git a/fuse-mounter.h b/fuse_mounter.h
similarity index 100%
rename from fuse-mounter.h
rename to fuse_mounter.h
diff --git a/glib-process.cc b/glib_process.cc
similarity index 98%
rename from glib-process.cc
rename to glib_process.cc
index 157406b..bc06f6a 100644
--- a/glib-process.cc
+++ b/glib_process.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/glib-process.h"
+#include "cros-disks/glib_process.h"
#include <base/logging.h>
diff --git a/glib-process.h b/glib_process.h
similarity index 100%
rename from glib-process.h
rename to glib_process.h
diff --git a/glib-process_unittest.cc b/glib_process_unittest.cc
similarity index 98%
rename from glib-process_unittest.cc
rename to glib_process_unittest.cc
index f75bbf1..cdbc401 100644
--- a/glib-process_unittest.cc
+++ b/glib_process_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/glib-process.h"
+#include "cros-disks/glib_process.h"
#include <glib.h>
diff --git a/mount-info.cc b/mount_info.cc
similarity index 97%
rename from mount-info.cc
rename to mount_info.cc
index 66d8390..cd73857 100644
--- a/mount-info.cc
+++ b/mount_info.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/mount-info.h"
+#include "cros-disks/mount_info.h"
#include <base/string_split.h>
#include <base/logging.h>
-#include "cros-disks/file-reader.h"
+#include "cros-disks/file_reader.h"
using base::FilePath;
using std::string;
diff --git a/mount-info.h b/mount_info.h
similarity index 100%
rename from mount-info.h
rename to mount_info.h
diff --git a/mount-info_unittest.cc b/mount_info_unittest.cc
similarity index 98%
rename from mount-info_unittest.cc
rename to mount_info_unittest.cc
index ca20d25..f34aa93 100644
--- a/mount-info_unittest.cc
+++ b/mount_info_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/mount-info.h"
+#include "cros-disks/mount_info.h"
#include <base/file_util.h>
#include <base/stringprintf.h>
diff --git a/mount-manager.cc b/mount_manager.cc
similarity index 99%
rename from mount-manager.cc
rename to mount_manager.cc
index b06659d..681d2b2 100644
--- a/mount-manager.cc
+++ b/mount_manager.cc
@@ -4,7 +4,7 @@
// Implements cros-disks::MountManager. See mount-manager.h for details.
-#include "cros-disks/mount-manager.h"
+#include "cros-disks/mount_manager.h"
#include <sys/mount.h>
#include <unistd.h>
diff --git a/mount-manager.h b/mount_manager.h
similarity index 100%
rename from mount-manager.h
rename to mount_manager.h
diff --git a/mount-manager_unittest.cc b/mount_manager_unittest.cc
similarity index 99%
rename from mount-manager_unittest.cc
rename to mount_manager_unittest.cc
index 190c57b..bd72718 100644
--- a/mount-manager_unittest.cc
+++ b/mount_manager_unittest.cc
@@ -5,7 +5,7 @@
// Unit tests for cros_disks::MountManager. See mount-manager.h for details
// on MountManager.
-#include "cros-disks/mount-manager.h"
+#include "cros-disks/mount_manager.h"
#include <sys/mount.h>
#include <sys/unistd.h>
diff --git a/mount-options.cc b/mount_options.cc
similarity index 99%
rename from mount-options.cc
rename to mount_options.cc
index 5aa7b56..a4cbe2c 100644
--- a/mount-options.cc
+++ b/mount_options.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/mount-options.h"
+#include "cros-disks/mount_options.h"
#include <sys/mount.h>
diff --git a/mount-options.h b/mount_options.h
similarity index 100%
rename from mount-options.h
rename to mount_options.h
diff --git a/mount-options_unittest.cc b/mount_options_unittest.cc
similarity index 99%
rename from mount-options_unittest.cc
rename to mount_options_unittest.cc
index df8ea95..b0cd196 100644
--- a/mount-options_unittest.cc
+++ b/mount_options_unittest.cc
@@ -10,7 +10,7 @@
#include <base/basictypes.h>
#include <gtest/gtest.h>
-#include "cros-disks/mount-options.h"
+#include "cros-disks/mount_options.h"
using std::pair;
using std::string;
diff --git a/mounter.h b/mounter.h
index 02604d0..c583175 100644
--- a/mounter.h
+++ b/mounter.h
@@ -10,7 +10,7 @@
#include <base/basictypes.h>
#include <chromeos/dbus/service_constants.h>
-#include "cros-disks/mount-options.h"
+#include "cros-disks/mount_options.h"
namespace cros_disks {
diff --git a/mounter_unittest.cc b/mounter_unittest.cc
index e299abd..f786d7e 100644
--- a/mounter_unittest.cc
+++ b/mounter_unittest.cc
@@ -9,7 +9,7 @@
#include <gtest/gtest.h>
#include "cros-disks/mounter.h"
-#include "cros-disks/mount-options.h"
+#include "cros-disks/mount_options.h"
using std::string;
using std::vector;
diff --git a/ntfs-mounter.cc b/ntfs_mounter.cc
similarity index 95%
rename from ntfs-mounter.cc
rename to ntfs_mounter.cc
index 1d3d172..66e8159 100644
--- a/ntfs-mounter.cc
+++ b/ntfs_mounter.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/ntfs-mounter.h"
+#include "cros-disks/ntfs_mounter.h"
#include "cros-disks/platform.h"
diff --git a/ntfs-mounter.h b/ntfs_mounter.h
similarity index 95%
rename from ntfs-mounter.h
rename to ntfs_mounter.h
index 5742cf7..738eee5 100644
--- a/ntfs-mounter.h
+++ b/ntfs_mounter.h
@@ -7,7 +7,7 @@
#include <string>
-#include "cros-disks/fuse-mounter.h"
+#include "cros-disks/fuse_mounter.h"
namespace cros_disks {
diff --git a/sandboxed-process.cc b/sandboxed_process.cc
similarity index 96%
rename from sandboxed-process.cc
rename to sandboxed_process.cc
index 1455914..edb843b 100644
--- a/sandboxed-process.cc
+++ b/sandboxed_process.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/sandboxed-process.h"
+#include "cros-disks/sandboxed_process.h"
#include <base/logging.h>
#include <chromeos/libminijail.h>
diff --git a/sandboxed-process.h b/sandboxed_process.h
similarity index 100%
rename from sandboxed-process.h
rename to sandboxed_process.h
diff --git a/session-manager-observer-interface.h b/session_manager_observer_interface.h
similarity index 100%
rename from session-manager-observer-interface.h
rename to session_manager_observer_interface.h
diff --git a/session-manager-proxy.cc b/session_manager_proxy.cc
similarity index 94%
rename from session-manager-proxy.cc
rename to session_manager_proxy.cc
index 9f1fb91..3060834 100644
--- a/session-manager-proxy.cc
+++ b/session_manager_proxy.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/session-manager-proxy.h"
+#include "cros-disks/session_manager_proxy.h"
#include <string>
#include <chromeos/dbus/service_constants.h>
-#include "cros-disks/session-manager-observer-interface.h"
+#include "cros-disks/session_manager_observer_interface.h"
using std::string;
diff --git a/session-manager-proxy.h b/session_manager_proxy.h
similarity index 100%
rename from session-manager-proxy.h
rename to session_manager_proxy.h
diff --git a/system-mounter.cc b/system_mounter.cc
similarity index 97%
rename from system-mounter.cc
rename to system_mounter.cc
index aeaed50..daa8195 100644
--- a/system-mounter.cc
+++ b/system_mounter.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/system-mounter.h"
+#include "cros-disks/system_mounter.h"
#include <errno.h>
#include <sys/mount.h>
diff --git a/system-mounter.h b/system_mounter.h
similarity index 100%
rename from system-mounter.h
rename to system_mounter.h
diff --git a/system-mounter_unittest.cc b/system_mounter_unittest.cc
similarity index 95%
rename from system-mounter_unittest.cc
rename to system_mounter_unittest.cc
index 6cf0a08..2bf9d41 100644
--- a/system-mounter_unittest.cc
+++ b/system_mounter_unittest.cc
@@ -10,8 +10,8 @@
#include <base/files/scoped_temp_dir.h>
#include <gtest/gtest.h>
-#include "cros-disks/mount-options.h"
-#include "cros-disks/system-mounter.h"
+#include "cros-disks/mount_options.h"
+#include "cros-disks/system_mounter.h"
using std::string;
using std::vector;
diff --git a/udev-device.cc b/udev_device.cc
similarity index 99%
rename from udev-device.cc
rename to udev_device.cc
index 3cd01fe..dc27e55 100644
--- a/udev-device.cc
+++ b/udev_device.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/udev-device.h"
+#include "cros-disks/udev_device.h"
#include <fcntl.h>
#include <libudev.h>
@@ -17,8 +17,8 @@
#include <base/string_util.h>
#include <rootdev/rootdev.h>
-#include "cros-disks/mount-info.h"
-#include "cros-disks/usb-device-info.h"
+#include "cros-disks/mount_info.h"
+#include "cros-disks/usb_device_info.h"
using std::string;
using std::vector;
diff --git a/udev-device.h b/udev_device.h
similarity index 100%
rename from udev-device.h
rename to udev_device.h
diff --git a/udev-device_unittest.cc b/udev_device_unittest.cc
similarity index 99%
rename from udev-device_unittest.cc
rename to udev_device_unittest.cc
index 6b3ff1c..b07fbf5 100644
--- a/udev-device_unittest.cc
+++ b/udev_device_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/udev-device.h"
+#include "cros-disks/udev_device.h"
#include <libudev.h>
diff --git a/usb-device-info.cc b/usb_device_info.cc
similarity index 97%
rename from usb-device-info.cc
rename to usb_device_info.cc
index d79894a..34d7ce6 100644
--- a/usb-device-info.cc
+++ b/usb_device_info.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/usb-device-info.h"
+#include "cros-disks/usb_device_info.h"
#include <vector>
@@ -10,7 +10,7 @@
#include <base/string_split.h>
#include <base/string_util.h>
-#include "cros-disks/file-reader.h"
+#include "cros-disks/file_reader.h"
using base::FilePath;
using std::map;
diff --git a/usb-device-info.h b/usb_device_info.h
similarity index 100%
rename from usb-device-info.h
rename to usb_device_info.h
diff --git a/usb-device-info_unittest.cc b/usb_device_info_unittest.cc
similarity index 99%
rename from usb-device-info_unittest.cc
rename to usb_device_info_unittest.cc
index 2e88b81..2271ba0 100644
--- a/usb-device-info_unittest.cc
+++ b/usb_device_info_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cros-disks/usb-device-info.h"
+#include "cros-disks/usb_device_info.h"
#include <base/file_util.h>
#include <gtest/gtest.h>
