[DevTools] Remove InspectorAgent::discardAgent.

third_party/WebKit/Source/modules/webdatabase/InspectorDatabaseAgent.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 215 matching lines @@
 void InspectorDatabaseAgent::didOpenDatabase(blink::Database* database, const String& domain, const String& name, const String& version)
 {
     if (InspectorDatabaseResource* resource = findByFileName(database->fileName())) {
         resource->setDatabase(database);
         return;
     }
 
     InspectorDatabaseResource* resource = InspectorDatabaseResource::create(database, domain, name, version);
     m_resources.set(resource->id(), resource);
     // Resources are only bound while visible.
-    if (frontend() && m_enabled)
-        resource->bind(frontend());
+    ASSERT(m_enabled && frontend());
+    resource->bind(frontend());
 }
 
 void InspectorDatabaseAgent::didCommitLoadForLocalFrame(LocalFrame* frame)
 {
     // FIXME(dgozman): adapt this for out-of-process iframes.
     if (frame != m_page->mainFrame())
         return;
 
     m_resources.clear();
 }
 
 InspectorDatabaseAgent::InspectorDatabaseAgent(Page* page)
     : InspectorBaseAgent<InspectorDatabaseAgent, protocol::Frontend::Database>("Database")
     , m_page(page)
     , m_enabled(false)
 {
-    DatabaseClient::fromPage(page)->setInspectorAgent(this);
-    DatabaseTracker::tracker().forEachOpenDatabaseInPage(m_page, bind<blink::Database*>(&InspectorDatabaseAgent::registerDatabaseOnCreation, this));
 }
 
 InspectorDatabaseAgent::~InspectorDatabaseAgent()
 {
 }
 
-void InspectorDatabaseAgent::discardAgent()
-{
-    if (DatabaseClient* client = DatabaseClient::fromPage(m_page))
-        client->setInspectorAgent(nullptr);
-}
-
 void InspectorDatabaseAgent::enable(ErrorString*)
 {
     if (m_enabled)
         return;
     m_enabled = true;
     m_state->setBoolean(DatabaseAgentState::databaseAgentEnabled, m_enabled);
-
-    DatabaseResourcesHeapMap::iterator databasesEnd = m_resources.end();
-    for (DatabaseResourcesHeapMap::iterator it = m_resources.begin(); it != databasesEnd; ++it)
-        it->value->bind(frontend());
+    if (DatabaseClient* client = DatabaseClient::fromPage(m_page))
+        client->setInspectorAgent(this);
+    DatabaseTracker::tracker().forEachOpenDatabaseInPage(m_page, bind<blink::Database*>(&InspectorDatabaseAgent::registerDatabaseOnCreation, this));
 }
 
 void InspectorDatabaseAgent::disable(ErrorString*)
 {
     if (!m_enabled)
         return;
     m_enabled = false;
     m_state->setBoolean(DatabaseAgentState::databaseAgentEnabled, m_enabled);
+    if (DatabaseClient* client = DatabaseClient::fromPage(m_page))
+        client->setInspectorAgent(nullptr);
+    m_resources.clear();
 }
 
 void InspectorDatabaseAgent::restore()
 {
-    m_enabled = m_state->booleanProperty(DatabaseAgentState::databaseAgentEnabled, false);
+    if (m_state->booleanProperty(DatabaseAgentState::databaseAgentEnabled, false)) {
+        ErrorString error;
+        enable(&error);
+    }
 }
 
 void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, const String& databaseId, OwnPtr<protocol::Array<String>>* names)
 {
     if (!m_enabled) {
         *error = "Database agent is not enabled";
         return;
     }
 
     *names = protocol::Array<String>::create();
@@ skipping 47 matching lines @@
 }
 
 DEFINE_TRACE(InspectorDatabaseAgent)
 {
     visitor->trace(m_page);
     visitor->trace(m_resources);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink