Cleaning WebDOMActivityLogger interface.

Source/bindings/v8/V8DOMActivityLogger.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "bindings/v8/V8DOMActivityLogger.h"
 
 #include "bindings/v8/V8Binding.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/HashMap.h"
@@ skipping 14 matching lines @@
 
 static DOMActivityLoggerMapForIsolatedWorld& domActivityLoggersForIsolatedWorld()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(DOMActivityLoggerMapForIsolatedWorld, map, ());
     return map;
 }
 
 void V8DOMActivityLogger::setActivityLogger(int worldId, const String& extensionId, PassOwnPtr<V8DOMActivityLogger> logger)
 {
-    // FIXME: The following line is a stub to allow appropriate modifications to
-    // chromium code base. When the modifications are done, remove this line.
-    domActivityLoggersForIsolatedWorld().set(worldId, logger);
-    return;
-
-    if (worldId) {
+    if (worldId)
         domActivityLoggersForIsolatedWorld().set(worldId, logger);
-    } else {
+    else
         domActivityLoggersForMainWorld().set(extensionId, logger);
-    }
 }
 
 V8DOMActivityLogger* V8DOMActivityLogger::activityLogger(int worldId, const String& extensionId)
 {
-    {
-        // FIXME: The following lines are a stub to allow appropriate modifications to
-        // chromium code base. When the modifications are done, remove these lines.
-        DOMActivityLoggerMapForIsolatedWorld& loggers = domActivityLoggersForIsolatedWorld();
-        DOMActivityLoggerMapForIsolatedWorld::iterator it = loggers.find(worldId);
-        return it == loggers.end() ? 0 : it->value.get();
-    }
-
     if (worldId) {
         DOMActivityLoggerMapForIsolatedWorld& loggers = domActivityLoggersForIsolatedWorld();
         DOMActivityLoggerMapForIsolatedWorld::iterator it = loggers.find(worldId);
         return it == loggers.end() ? 0 : it->value.get();
     }
 
     if (extensionId.isEmpty())
         return 0;
 
     DOMActivityLoggerMapForMainWorld& loggers = domActivityLoggersForMainWorld();
     DOMActivityLoggerMapForMainWorld::iterator it = loggers.find(extensionId);
     return it == loggers.end() ? 0 : it->value.get();
 }
 
 V8DOMActivityLogger* V8DOMActivityLogger::activityLogger(int worldId, const KURL& url)
 {
-    // FIXME: The following line is a stub to allow appropriate modifications to
-    // chromium code base. When the modifications are done, remove this line.
-    return activityLogger(worldId, String());
-
     // extension ID is ignored for worldId != 0.
     if (worldId)
         return activityLogger(worldId, String());
 
     // To find an activity logger that corresponds to the main world of an
     // extension, we need to obtain the extension ID. Extension ID is a hostname
     // of a background page's URL.
     if (!url.protocolIs("chrome-extension"))
         return 0;
 
     return activityLogger(worldId, url.host());
 }
 
 } // namespace WebCore