Skip to content

GitLab

T
tangled
Commit 2588a9f5 authored by tfarina@chromium.org's avatar tfarina@chromium.org
Browse files
Options

Cleanup namespace usage in modules/. 

BUG=None
TEST=blink_tests
R=abarth@chromium.org

Review URL: https://codereview.chromium.org/454353002

git-svn-id: svn://svn.chromium.org/blink/trunk@179981 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a3a894a1
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 41 deletions
third_party/WebKit/Source/modules/indexeddb/IDBKeyPathTest.cpp
View file @ 2588a9f5
......@@ -33,8 +33,7 @@
#include <gtest/gtest.h>
using namespace blink;
namespace blink {
namespace {
void checkKeyPath(const String& keyPath, const Vector<String>& expected, int parserError)
......@@ -126,3 +125,4 @@ TEST(IDBKeyPathTest, InvalidKeyPath5)
}
} // namespace
} // namespace blink
third_party/WebKit/Source/modules/indexeddb/IDBRequestTest.cpp
View file @ 2588a9f5
......@@ -46,9 +46,7 @@
#include <gtest/gtest.h>
#include <v8.h>
using blink::WebBlobInfo;
using namespace blink;
namespace blink {
namespace {
class IDBRequestTest : public testing::Test {
......@@ -107,7 +105,7 @@ TEST_F(IDBRequestTest, AbortErrorAfterAbort)
request->onError(DOMError::create(AbortError, "Description goes here."));
}
class MockWebIDBDatabase : public blink::WebIDBDatabase {
class MockWebIDBDatabase : public WebIDBDatabase {
public:
static PassOwnPtr<MockWebIDBDatabase> create()
{
......@@ -147,7 +145,7 @@ TEST_F(IDBRequestTest, ConnectionsAfterStopping)
EXPECT_EQ(request->readyState(), "pending");
executionContext()->stopActiveDOMObjects();
request->onUpgradeNeeded(oldVersion, backend.release(), metadata, blink::WebIDBDataLossNone, String());
request->onUpgradeNeeded(oldVersion, backend.release(), metadata, WebIDBDataLossNone, String());
}
{
......@@ -161,3 +159,4 @@ TEST_F(IDBRequestTest, ConnectionsAfterStopping)
}
} // namespace
} // namespace blink
third_party/WebKit/Source/modules/indexeddb/IDBTransactionTest.cpp
View file @ 2588a9f5
......@@ -41,10 +41,7 @@
#include <gtest/gtest.h>
#include <v8.h>
using namespace blink;
using blink::WebIDBDatabase;
namespace blink {
namespace {
class IDBTransactionTest : public testing::Test {
......@@ -70,7 +67,7 @@ private:
RefPtrWillBePersistent<ExecutionContext> m_executionContext;
};
class FakeWebIDBDatabase FINAL : public blink::WebIDBDatabase {
class FakeWebIDBDatabase FINAL : public WebIDBDatabase {
public:
static PassOwnPtr<FakeWebIDBDatabase> create() { return adoptPtr(new FakeWebIDBDatabase()); }
......@@ -100,7 +97,7 @@ TEST_F(IDBTransactionTest, EnsureLifetime)
const int64_t transactionId = 1234;
const Vector<String> transactionScope;
Persistent<IDBTransaction> transaction = IDBTransaction::create(executionContext(), transactionId, transactionScope, blink::WebIDBTransactionModeReadOnly, db.get());
Persistent<IDBTransaction> transaction = IDBTransaction::create(executionContext(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
PersistentHeapHashSet<WeakMember<IDBTransaction> > set;
set.add(transaction);
......@@ -130,7 +127,7 @@ TEST_F(IDBTransactionTest, TransactionFinish)
const int64_t transactionId = 1234;
const Vector<String> transactionScope;
Persistent<IDBTransaction> transaction = IDBTransaction::create(executionContext(), transactionId, transactionScope, blink::WebIDBTransactionModeReadOnly, db.get());
Persistent<IDBTransaction> transaction = IDBTransaction::create(executionContext(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
PersistentHeapHashSet<WeakMember<IDBTransaction> > set;
set.add(transaction);
......@@ -160,3 +157,4 @@ TEST_F(IDBTransactionTest, TransactionFinish)
}
} // namespace
} // namespace blink
third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp
View file @ 2588a9f5
......@@ -26,8 +26,7 @@
#include <gtest/gtest.h>
#include <v8.h>
using namespace blink;
namespace blink {
namespace {
// Promise-related test support.
......@@ -342,3 +341,4 @@ TEST_F(ServiceWorkerContainerTest, RegisterUnregister_NonHttpsSecureOriginDelega
}
} // namespace
} // namespace blink
third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp
View file @ 2588a9f5
......@@ -38,8 +38,6 @@
#include <string.h>
#include <unistd.h>
using namespace blink;
// Defined in Chromium's codebase in third_party/sqlite/src/os_unix.c
extern "C" {
void chromium_sqlite3_initialize_unix_sqlite3_file(sqlite3_file* file);
......@@ -49,6 +47,8 @@ void chromium_sqlite3_update_reusable_file_handle(sqlite3_file* file, int fd, in
void chromium_sqlite3_destroy_reusable_file_handle(sqlite3_file* file);
}
namespace blink {
// Chromium's Posix implementation of SQLite VFS
namespace {
......@@ -69,10 +69,10 @@ int chromiumOpen(sqlite3_vfs* vfs, const char* fileName,
return result;
if (fd < 0) {
fd = blink::Platform::current()->databaseOpenFile(String(fileName), desiredFlags);
fd = Platform::current()->databaseOpenFile(String(fileName), desiredFlags);
if ((fd < 0) && (desiredFlags & SQLITE_OPEN_READWRITE)) {
int newFlags = (desiredFlags & ~(SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)) | SQLITE_OPEN_READONLY;
fd = blink::Platform::current()->databaseOpenFile(String(fileName), newFlags);
fd = Platform::current()->databaseOpenFile(String(fileName), newFlags);
}
}
if (fd < 0) {
......@@ -103,7 +103,7 @@ int chromiumOpen(sqlite3_vfs* vfs, const char* fileName,
// should be synched after the file is deleted.
int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir)
{
return blink::Platform::current()->databaseDeleteFile(String(fileName), syncDir);
return Platform::current()->databaseDeleteFile(String(fileName), syncDir);
}
// Check the existance and status of the given file.
......@@ -114,7 +114,7 @@ int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir)
// res - the result.
int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res)
{
int attr = static_cast<int>(blink::Platform::current()->databaseGetFileAttributes(String(fileName)));
int attr = static_cast<int>(Platform::current()->databaseGetFileAttributes(String(fileName)));
if (attr < 0) {
*res = 0;
return SQLITE_OK;
......@@ -166,8 +166,6 @@ void* chromiumDlOpen(sqlite3_vfs*, const char*)
} // namespace
namespace blink {
void SQLiteFileSystem::registerSQLiteVFS()
{
sqlite3_vfs* unix_vfs = sqlite3_vfs_find("unix");
......
third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
View file @ 2588a9f5
......@@ -35,13 +35,13 @@
#include <sqlite3.h>
#include "public/platform/Platform.h"
using namespace blink;
// Defined in Chromium's codebase in third_party/sqlite/src/os_win.c
extern "C" {
int chromium_sqlite3_initialize_win_sqlite3_file(sqlite3_file* file, HANDLE handle);
}
namespace blink {
// Chromium's Windows implementation of SQLite VFS
namespace {
......@@ -55,7 +55,7 @@ namespace {
int chromiumOpen(sqlite3_vfs*, const char* fileName,
sqlite3_file* id, int desiredFlags, int* usedFlags)
{
HANDLE h = blink::Platform::current()->databaseOpenFile(String(fileName), desiredFlags);
HANDLE h = Platform::current()->databaseOpenFile(String(fileName), desiredFlags);
if (h == INVALID_HANDLE_VALUE) {
if (desiredFlags & SQLITE_OPEN_READWRITE) {
int newFlags = (desiredFlags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE;
......@@ -82,7 +82,7 @@ int chromiumOpen(sqlite3_vfs*, const char* fileName,
// should be synched after the file is deleted.
int chromiumDelete(sqlite3_vfs*, const char* fileName, int)
{
return blink::Platform::current()->databaseDeleteFile(String(fileName), false);
return Platform::current()->databaseDeleteFile(String(fileName), false);
}
// Check the existance and status of the given file.
......@@ -93,7 +93,7 @@ int chromiumDelete(sqlite3_vfs*, const char* fileName, int)
// res - the result.
int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res)
{
DWORD attr = blink::Platform::current()->databaseGetFileAttributes(String(fileName));
DWORD attr = Platform::current()->databaseGetFileAttributes(String(fileName));
switch (flag) {
case SQLITE_ACCESS_READ:
case SQLITE_ACCESS_EXISTS:
......@@ -138,8 +138,6 @@ void* chromiumDlOpen(sqlite3_vfs*, const char*)
} // namespace
namespace blink {
void SQLiteFileSystem::registerSQLiteVFS()
{
sqlite3_vfs* win32_vfs = sqlite3_vfs_find("win32");
......
third_party/WebKit/Source/modules/websockets/WebSocketDeflaterTest.cpp
View file @ 2588a9f5
......@@ -29,8 +29,7 @@
#include "wtf/Vector.h"
#include <gtest/gtest.h>
using namespace blink;
namespace blink {
namespace {
TEST(WebSocketDeflaterTest, TestCompressHello)
......@@ -153,4 +152,5 @@ TEST(WebSocketDeflaterTest, TestLargeData)
EXPECT_EQ(0, memcmp(inputData.data(), inflater->data(), inflater->size()));
}
}
} // namespace
} // namespace blink
third_party/WebKit/Source/modules/websockets/WebSocketExtensionDispatcherTest.cpp
View file @ 2588a9f5
......@@ -32,8 +32,7 @@
#include "wtf/text/StringHash.h"
#include <gtest/gtest.h>
using namespace blink;
namespace blink {
namespace {
class WebSocketExtensionDispatcherTest;
......@@ -181,4 +180,5 @@ TEST_F(WebSocketExtensionDispatcherTest, TestInvalid)
}
}
}
} // namespace
} // namespace blink
third_party/WebKit/Source/modules/websockets/WebSocketExtensionParserTest.cpp
View file @ 2588a9f5
......@@ -36,8 +36,7 @@
#include "wtf/text/WTFString.h"
#include <gtest/gtest.h>
using namespace blink;
namespace blink {
namespace {
TEST(WebSocketExtensionParserTest, simpleExtension)
......@@ -183,3 +182,4 @@ TEST(WebSocketExtensionParserTest, separatorInQuotedParameter)
}
} // namespace
} // namespace blink
third_party/WebKit/Source/modules/websockets/WebSocketPerMessageDeflateTest.cpp
View file @ 2588a9f5
......@@ -37,8 +37,7 @@
#include <gtest/gtest.h>
#include <iterator>
using namespace blink;
namespace blink {
namespace {
TEST(WebSocketPerMessageDeflateTest, TestDeflateHelloTakeOver)
......@@ -508,4 +507,6 @@ TEST(WebSocketPerMessageDeflateTest, TestNegotiationRequest)
String actual = WebSocketPerMessageDeflate().createExtensionProcessor()->handshakeString();
EXPECT_EQ(String("permessage-deflate; client_max_window_bits"), actual);
}
} // namespace
} // namespace blink
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment