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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/devtools/embedded_worker_devtools_manager_unittest.cc

Issue 269653002: Rename SharedWorkerDevToolsManager to EmbeddedWorkerDevToolsManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 | « content/browser/devtools/embedded_worker_devtools_manager.cc ('k') | content/browser/devtools/shared_worker_devtools_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/devtools/embedded_worker_devtools_manager_unittest.cc
diff --git a/content/browser/devtools/shared_worker_devtools_manager_unittest.cc b/content/browser/devtools/embedded_worker_devtools_manager_unittest.cc
similarity index 68%
rename from content/browser/devtools/shared_worker_devtools_manager_unittest.cc
rename to content/browser/devtools/embedded_worker_devtools_manager_unittest.cc
index 0f987b7d2fa417710741756051e78e3c5c05ea6d..49a6144134d61c40e6030eb66d415f19bfe84eb7 100644
--- a/content/browser/devtools/shared_worker_devtools_manager_unittest.cc
+++ b/content/browser/devtools/embedded_worker_devtools_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 "content/browser/devtools/shared_worker_devtools_manager.h"
+#include "content/browser/devtools/embedded_worker_devtools_manager.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
@@ -23,8 +23,8 @@ class TestDevToolsClientHost : public DevToolsClientHost {
public:
TestDevToolsClientHost() {}
virtual ~TestDevToolsClientHost() {}
- virtual void DispatchOnInspectorFrontend(const std::string& message)
- OVERRIDE {}
+ virtual void DispatchOnInspectorFrontend(
+ const std::string& message) OVERRIDE {}
virtual void InspectedContentsClosing() OVERRIDE {}
virtual void ReplacedWithAnotherClient() OVERRIDE {}
@@ -33,9 +33,9 @@ class TestDevToolsClientHost : public DevToolsClientHost {
};
}
-class SharedWorkerDevToolsManagerTest : public testing::Test {
+class EmbeddedWorkerDevToolsManagerTest : public testing::Test {
public:
- SharedWorkerDevToolsManagerTest()
+ EmbeddedWorkerDevToolsManagerTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
browser_context_(new TestBrowserContext()),
partition_(
@@ -51,26 +51,26 @@ class SharedWorkerDevToolsManagerTest : public testing::Test {
protected:
virtual void SetUp() OVERRIDE {
- manager_ = SharedWorkerDevToolsManager::GetInstance();
+ manager_ = EmbeddedWorkerDevToolsManager::GetInstance();
}
virtual void TearDown() OVERRIDE {
- SharedWorkerDevToolsManager::GetInstance()->ResetForTesting();
+ EmbeddedWorkerDevToolsManager::GetInstance()->ResetForTesting();
}
void CheckWorkerState(int worker_process_id,
int worker_route_id,
- SharedWorkerDevToolsManager::WorkerState state) {
- const SharedWorkerDevToolsManager::WorkerId id(worker_process_id,
- worker_route_id);
- SharedWorkerDevToolsManager::WorkerInfoMap::iterator it =
+ EmbeddedWorkerDevToolsManager::WorkerState state) {
+ const EmbeddedWorkerDevToolsManager::WorkerId id(worker_process_id,
+ worker_route_id);
+ EmbeddedWorkerDevToolsManager::WorkerInfoMap::iterator it =
manager_->workers_.find(id);
EXPECT_TRUE(manager_->workers_.end() != it);
EXPECT_EQ(state, it->second->state());
}
void CheckWorkerNotExist(int worker_process_id, int worker_route_id) {
- const SharedWorkerDevToolsManager::WorkerId id(worker_process_id,
- worker_route_id);
+ const EmbeddedWorkerDevToolsManager::WorkerId id(worker_process_id,
+ worker_route_id);
EXPECT_TRUE(manager_->workers_.end() == manager_->workers_.find(id));
}
@@ -93,10 +93,10 @@ class SharedWorkerDevToolsManagerTest : public testing::Test {
scoped_ptr<TestBrowserContext> browser_context_;
scoped_ptr<WorkerStoragePartition> partition_;
const WorkerStoragePartitionId partition_id_;
- SharedWorkerDevToolsManager* manager_;
+ EmbeddedWorkerDevToolsManager* manager_;
};
-TEST_F(SharedWorkerDevToolsManagerTest, BasicTest) {
+TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) {
scoped_refptr<DevToolsAgentHost> agent_host;
SharedWorkerInstance instance1(GURL("http://example.com/w.js"),
@@ -111,71 +111,71 @@ TEST_F(SharedWorkerDevToolsManagerTest, BasicTest) {
// Created -> Started -> Destroyed
CheckWorkerNotExist(1, 1);
- manager_->WorkerCreated(1, 1, instance1);
- CheckWorkerState(1, 1, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ manager_->SharedWorkerCreated(1, 1, instance1);
+ CheckWorkerState(1, 1, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(1, 1);
- CheckWorkerState(1, 1, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ CheckWorkerState(1, 1, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
manager_->WorkerDestroyed(1, 1);
CheckWorkerNotExist(1, 1);
// Created -> GetDevToolsAgentHost -> Started -> Destroyed
CheckWorkerNotExist(1, 2);
- manager_->WorkerCreated(1, 2, instance1);
- CheckWorkerState(1, 2, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ manager_->SharedWorkerCreated(1, 2, instance1);
+ CheckWorkerState(1, 2, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
agent_host = manager_->GetDevToolsAgentHostForWorker(1, 2);
EXPECT_TRUE(agent_host.get());
- CheckWorkerState(1, 2, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(1, 2, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
EXPECT_EQ(agent_host.get(), manager_->GetDevToolsAgentHostForWorker(1, 2));
manager_->WorkerContextStarted(1, 2);
- CheckWorkerState(1, 2, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(1, 2, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
manager_->WorkerDestroyed(1, 2);
CheckWorkerNotExist(1, 2);
agent_host = NULL;
// Created -> Started -> GetDevToolsAgentHost -> Destroyed
CheckWorkerNotExist(1, 3);
- manager_->WorkerCreated(1, 3, instance1);
- CheckWorkerState(1, 3, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ manager_->SharedWorkerCreated(1, 3, instance1);
+ CheckWorkerState(1, 3, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(1, 3);
- CheckWorkerState(1, 3, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ CheckWorkerState(1, 3, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
agent_host = manager_->GetDevToolsAgentHostForWorker(1, 3);
EXPECT_TRUE(agent_host.get());
- CheckWorkerState(1, 3, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(1, 3, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
manager_->WorkerDestroyed(1, 3);
CheckWorkerNotExist(1, 3);
agent_host = NULL;
// Created -> Destroyed
CheckWorkerNotExist(1, 4);
- manager_->WorkerCreated(1, 4, instance1);
- CheckWorkerState(1, 4, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ manager_->SharedWorkerCreated(1, 4, instance1);
+ CheckWorkerState(1, 4, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
manager_->WorkerDestroyed(1, 4);
CheckWorkerNotExist(1, 4);
// Created -> GetDevToolsAgentHost -> Destroyed
CheckWorkerNotExist(1, 5);
- manager_->WorkerCreated(1, 5, instance1);
- CheckWorkerState(1, 5, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ manager_->SharedWorkerCreated(1, 5, instance1);
+ CheckWorkerState(1, 5, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
agent_host = manager_->GetDevToolsAgentHostForWorker(1, 5);
EXPECT_TRUE(agent_host.get());
- CheckWorkerState(1, 5, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(1, 5, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
manager_->WorkerDestroyed(1, 5);
CheckWorkerNotExist(1, 5);
agent_host = NULL;
// Created -> GetDevToolsAgentHost -> Free agent_host -> Destroyed
CheckWorkerNotExist(1, 6);
- manager_->WorkerCreated(1, 6, instance1);
- CheckWorkerState(1, 6, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ manager_->SharedWorkerCreated(1, 6, instance1);
+ CheckWorkerState(1, 6, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
agent_host = manager_->GetDevToolsAgentHostForWorker(1, 6);
EXPECT_TRUE(agent_host.get());
- CheckWorkerState(1, 6, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(1, 6, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
agent_host = NULL;
manager_->WorkerDestroyed(1, 6);
CheckWorkerNotExist(1, 6);
}
-TEST_F(SharedWorkerDevToolsManagerTest, AttachTest) {
+TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) {
scoped_refptr<DevToolsAgentHost> agent_host1;
scoped_refptr<DevToolsAgentHost> agent_host2;
@@ -195,64 +195,64 @@ TEST_F(SharedWorkerDevToolsManagerTest, AttachTest) {
// Created -> GetDevToolsAgentHost -> Register -> Started -> Destroyed
scoped_ptr<TestDevToolsClientHost> client_host1(new TestDevToolsClientHost());
CheckWorkerNotExist(2, 1);
- manager_->WorkerCreated(2, 1, instance1);
- CheckWorkerState(2, 1, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ manager_->SharedWorkerCreated(2, 1, instance1);
+ CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
agent_host1 = manager_->GetDevToolsAgentHostForWorker(2, 1);
EXPECT_TRUE(agent_host1.get());
- CheckWorkerState(2, 1, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1));
RegisterDevToolsClientHostFor(agent_host1.get(), client_host1.get());
- CheckWorkerState(2, 1, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
manager_->WorkerContextStarted(2, 1);
- CheckWorkerState(2, 1, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
manager_->WorkerDestroyed(2, 1);
- CheckWorkerState(2, 1, SharedWorkerDevToolsManager::WORKER_TERMINATED);
+ CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED);
EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1));
// Created -> Started -> GetDevToolsAgentHost -> Register -> Destroyed
scoped_ptr<TestDevToolsClientHost> client_host2(new TestDevToolsClientHost());
- manager_->WorkerCreated(2, 2, instance2);
- CheckWorkerState(2, 2, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ manager_->SharedWorkerCreated(2, 2, instance2);
+ CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(2, 2);
- CheckWorkerState(2, 2, SharedWorkerDevToolsManager::WORKER_UNINSPECTED);
+ CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED);
agent_host2 = manager_->GetDevToolsAgentHostForWorker(2, 2);
EXPECT_TRUE(agent_host2.get());
EXPECT_NE(agent_host1.get(), agent_host2.get());
EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2));
- CheckWorkerState(2, 2, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
RegisterDevToolsClientHostFor(agent_host2.get(), client_host2.get());
- CheckWorkerState(2, 2, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
manager_->WorkerDestroyed(2, 2);
- CheckWorkerState(2, 2, SharedWorkerDevToolsManager::WORKER_TERMINATED);
+ CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED);
EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2));
// Re-created -> Started -> ClientHostClosing -> Destroyed
- CheckWorkerState(2, 1, SharedWorkerDevToolsManager::WORKER_TERMINATED);
- manager_->WorkerCreated(2, 3, instance1);
+ CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED);
+ manager_->SharedWorkerCreated(2, 3, instance1);
CheckWorkerNotExist(2, 1);
- CheckWorkerState(2, 3, SharedWorkerDevToolsManager::WORKER_PAUSED);
+ CheckWorkerState(2, 3, EmbeddedWorkerDevToolsManager::WORKER_PAUSED);
EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 3));
manager_->WorkerContextStarted(2, 3);
- CheckWorkerState(2, 3, SharedWorkerDevToolsManager::WORKER_INSPECTED);
+ CheckWorkerState(2, 3, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED);
ClientHostClosing(client_host1.get());
manager_->WorkerDestroyed(2, 3);
CheckWorkerNotExist(2, 3);
agent_host1 = NULL;
// Re-created -> Destroyed
- CheckWorkerState(2, 2, SharedWorkerDevToolsManager::WORKER_TERMINATED);
- manager_->WorkerCreated(2, 4, instance2);
+ CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED);
+ manager_->SharedWorkerCreated(2, 4, instance2);
CheckWorkerNotExist(2, 2);
- CheckWorkerState(2, 4, SharedWorkerDevToolsManager::WORKER_PAUSED);
+ CheckWorkerState(2, 4, EmbeddedWorkerDevToolsManager::WORKER_PAUSED);
EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 4));
manager_->WorkerDestroyed(2, 4);
CheckWorkerNotExist(2, 4);
- CheckWorkerState(2, 2, SharedWorkerDevToolsManager::WORKER_TERMINATED);
+ CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED);
// Re-created -> ClientHostClosing -> Destroyed
- manager_->WorkerCreated(2, 5, instance2);
+ manager_->SharedWorkerCreated(2, 5, instance2);
CheckWorkerNotExist(2, 2);
- CheckWorkerState(2, 5, SharedWorkerDevToolsManager::WORKER_PAUSED);
+ CheckWorkerState(2, 5, EmbeddedWorkerDevToolsManager::WORKER_PAUSED);
EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 5));
ClientHostClosing(client_host2.get());
CheckWorkerCount(1);
« no previous file with comments | « content/browser/devtools/embedded_worker_devtools_manager.cc ('k') | content/browser/devtools/shared_worker_devtools_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698