diff options
8 files changed, 25 insertions, 18 deletions
diff --git a/webkit/fileapi/file_system_context_unittest.cc b/webkit/fileapi/file_system_context_unittest.cc index 025b7f3..6913315 100644 --- a/webkit/fileapi/file_system_context_unittest.cc +++ b/webkit/fileapi/file_system_context_unittest.cc @@ -14,8 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webkit/quota/quota_manager.h" -using namespace fileapi; - +namespace fileapi { namespace { static const char* const kTestOrigins[] = { @@ -92,3 +91,5 @@ TEST(FileSystemContextTest, IsStorageUnlimited) { context->IsStorageUnlimited(origin)); } } + +} // namespace fileapi diff --git a/webkit/fileapi/file_system_path_manager_unittest.cc b/webkit/fileapi/file_system_path_manager_unittest.cc index e36a97e..7b07b01 100644 --- a/webkit/fileapi/file_system_path_manager_unittest.cc +++ b/webkit/fileapi/file_system_path_manager_unittest.cc @@ -23,8 +23,7 @@ #include "webkit/fileapi/sandbox_mount_point_provider.h" #include "webkit/quota/special_storage_policy.h" -using namespace fileapi; - +namespace fileapi { namespace { // PS stands for path separator. @@ -414,3 +413,5 @@ TEST_F(FileSystemPathManagerTest, IsRestrictedName) { manager->IsRestrictedFileName(kFileSystemTypeTemporary, name)); } } + +} // namespace fileapi diff --git a/webkit/fileapi/file_system_usage_cache_unittest.cc b/webkit/fileapi/file_system_usage_cache_unittest.cc index 35dadac..4188432 100644 --- a/webkit/fileapi/file_system_usage_cache_unittest.cc +++ b/webkit/fileapi/file_system_usage_cache_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" -using namespace fileapi; +namespace fileapi { class FileSystemUsageCacheTest : public testing::Test { public: @@ -132,3 +132,5 @@ TEST_F(FileSystemUsageCacheTest, DecrementDirtyWithoutCacheFileTest) { FilePath usage_file_path = GetUsageFilePath(); EXPECT_FALSE(FileSystemUsageCache::IncrementDirty(usage_file_path)); } + +} // namespace fileapi diff --git a/webkit/fileapi/local_file_system_file_util_unittest.cc b/webkit/fileapi/local_file_system_file_util_unittest.cc index d2401f5..b4b4e3d 100644 --- a/webkit/fileapi/local_file_system_file_util_unittest.cc +++ b/webkit/fileapi/local_file_system_file_util_unittest.cc @@ -21,8 +21,7 @@ #include "webkit/fileapi/quota_file_util.h" #include "webkit/quota/quota_manager.h" -using namespace fileapi; - +namespace fileapi { namespace { class MockFileSystemPathManager : public FileSystemPathManager { @@ -305,3 +304,5 @@ TEST_F(LocalFileSystemFileUtilTest, MoveDirectory) { EXPECT_TRUE(FileExists(to_file)); EXPECT_EQ(1020, GetSize(to_file)); } + +} // namespace fileapi diff --git a/webkit/fileapi/quota_file_util_unittest.cc b/webkit/fileapi/quota_file_util_unittest.cc index bb76f65..8a2f8fb 100644 --- a/webkit/fileapi/quota_file_util_unittest.cc +++ b/webkit/fileapi/quota_file_util_unittest.cc @@ -17,10 +17,8 @@ #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_usage_cache.h" -using namespace fileapi; - +namespace fileapi { namespace { - class MockFileSystemPathManager : public FileSystemPathManager { public: MockFileSystemPathManager(const FilePath& filesystem_path) @@ -39,8 +37,7 @@ class MockFileSystemPathManager : public FileSystemPathManager { private: FilePath test_filesystem_path_; }; - -} // namespace (anonymous) +} // namespace class QuotaFileUtilTest : public testing::Test { public: @@ -431,3 +428,5 @@ TEST_F(QuotaFileUtilTest, Remove) { true)); ASSERT_EQ(0, GetCachedUsage()); } + +} // namespace fileapi diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc index 54f6865..6da59d5 100644 --- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc +++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc @@ -20,7 +20,7 @@ #include "webkit/fileapi/file_system_path_manager.h" #include "webkit/fileapi/file_system_util.h" -using namespace fileapi; +namespace fileapi { class MockFileSystemPathManager : public FileSystemPathManager { public: @@ -105,3 +105,5 @@ TEST_F(SandboxMountPointProviderOriginEnumeratorTest, EnumerateOrigins) { ASSERT_EQ(temporary_size, temporary_actual_size); ASSERT_EQ(persistent_size, persistent_actual_size); } + +} // namespace fileapi diff --git a/webkit/fileapi/sandbox_quota_client.cc b/webkit/fileapi/sandbox_quota_client.cc index b35e7ba..3b6ceda 100644 --- a/webkit/fileapi/sandbox_quota_client.cc +++ b/webkit/fileapi/sandbox_quota_client.cc @@ -21,8 +21,6 @@ #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/sandbox_mount_point_provider.h" -using namespace std; - using base::MessageLoopProxy; using quota::QuotaThreadTask; using quota::StorageType; diff --git a/webkit/fileapi/sandbox_quota_client_unittest.cc b/webkit/fileapi/sandbox_quota_client_unittest.cc index c77e423..1ffc2b2 100644 --- a/webkit/fileapi/sandbox_quota_client_unittest.cc +++ b/webkit/fileapi/sandbox_quota_client_unittest.cc @@ -19,9 +19,9 @@ #include "webkit/fileapi/sandbox_quota_client.h" #include "webkit/quota/quota_types.h" -using namespace fileapi; - +namespace fileapi { namespace { + const char kDummyURL1[] = "http://www.dummy.org"; const char kDummyURL2[] = "http://www.example.com"; const char kDummyURL3[] = "http://www.bleh"; @@ -37,7 +37,8 @@ class MockFileSystemPathManager : public FileSystemPathManager { : FileSystemPathManager(base::MessageLoopProxy::CreateForCurrentThread(), filesystem_path, NULL, false, true) {} }; -} + +} // namespace class SandboxQuotaClientTest : public testing::Test { public: @@ -429,3 +430,5 @@ TEST_F(SandboxQuotaClientTest, IncognitoTest) { origins = GetOriginsForHost(quota_client.get(), kTemporary, "www.dummy.org"); EXPECT_EQ(0U, origins.size()); } + +} // namespace fileapi |