Index: content/browser/devtools/devtools_manager_unittest.cc |
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc |
index 70b3fa5f7f9164ee77379270dba16cf469a12178..2461179ae87fb2fe1500ae83a2e26e17a8d170f0 100644 |
--- a/content/browser/devtools/devtools_manager_unittest.cc |
+++ b/content/browser/devtools/devtools_manager_unittest.cc |
@@ -6,7 +6,6 @@ |
#include <memory> |
-#include "base/guid.h" |
#include "base/location.h" |
#include "base/macros.h" |
#include "base/run_loop.h" |
@@ -210,9 +209,29 @@ |
} |
class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate { |
- public: |
- TestExternalAgentDelegate() : id_(base::GenerateGUID()) { |
- } |
+ std::map<std::string,int> event_counter_; |
+ |
+ void recordEvent(const std::string& name) { |
+ if (event_counter_.find(name) == event_counter_.end()) |
+ event_counter_[name] = 0; |
+ event_counter_[name] = event_counter_[name] + 1; |
+ } |
+ |
+ void expectEvent(int count, const std::string& name) { |
+ EXPECT_EQ(count, event_counter_[name]); |
+ } |
+ |
+ void Attach(DevToolsExternalAgentProxy* proxy) override { |
+ recordEvent("Attach"); |
+ }; |
+ |
+ void Detach() override { recordEvent("Detach"); }; |
+ |
+ void SendMessageToBackend(const std::string& message) override { |
+ recordEvent(std::string("SendMessageToBackend.") + message); |
+ }; |
+ |
+ public : |
~TestExternalAgentDelegate() override { |
expectEvent(1, "Attach"); |
expectEvent(1, "Detach"); |
@@ -220,43 +239,6 @@ |
expectEvent(1, "SendMessageToBackend.message1"); |
expectEvent(2, "SendMessageToBackend.message2"); |
} |
- |
- private: |
- std::string id_; |
- std::map<std::string,int> event_counter_; |
- |
- void recordEvent(const std::string& name) { |
- if (event_counter_.find(name) == event_counter_.end()) |
- event_counter_[name] = 0; |
- event_counter_[name] = event_counter_[name] + 1; |
- } |
- |
- void expectEvent(int count, const std::string& name) { |
- EXPECT_EQ(count, event_counter_[name]); |
- } |
- |
- void Attach(DevToolsExternalAgentProxy* proxy) override { |
- recordEvent("Attach"); |
- }; |
- |
- void Detach() override { recordEvent("Detach"); }; |
- |
- std::string GetId() override { return id_; } |
- std::string GetType() override { return ""; } |
- std::string GetTitle() override { return ""; } |
- std::string GetDescription() override { return ""; } |
- GURL GetURL() override { return GURL(); } |
- GURL GetFaviconURL() override { return GURL(); } |
- |
- bool Activate() override { return false; }; |
- bool Inspect() override { return false; }; |
- void Reload() override { }; |
- bool Close() override { return false; }; |
- |
- void SendMessageToBackend(const std::string& message) override { |
- recordEvent(std::string("SendMessageToBackend.") + message); |
- }; |
- |
}; |
TEST_F(DevToolsManagerTest, TestExternalProxy) { |