blink: Rename modules/ method to prefix with get when they collide.

third_party/WebKit/Source/modules/storage/StorageArea.cpp

 /*
  * Copyright (C) 2009 Google Inc. All Rights Reserved.
  *           (C) 2008 Apple Inc.
  *
  * 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 129 matching lines @@
         return false;
 
     // LocalFrameLifecycleObserver is used to safely keep the cached
     // reference to the LocalFrame. Should the LocalFrame die before
     // this StorageArea does, that cached reference will be cleared.
     if (this->frame() == frame)
         return m_canAccessStorageCachedResult;
     StorageNamespaceController* controller = StorageNamespaceController::from(frame->page());
     if (!controller)
         return false;
-    bool result = controller->storageClient()->canAccessStorage(frame, m_storageType);
+    bool result = controller->getStorageClient()->canAccessStorage(frame, m_storageType);
     // Move attention to the new LocalFrame.
     LocalFrameLifecycleObserver::setContext(frame);
     m_canAccessStorageCachedResult = result;
     return result;
 }
 
 void StorageArea::dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue, SecurityOrigin* securityOrigin, const KURL& pageURL, WebStorageArea* sourceAreaInstance)
 {
     // Iterate over all pages that have a StorageNamespaceController supplement.
     for (Page* page : Page::ordinaryPages()) {
         for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
             // FIXME: We do not yet have a way to dispatch events to out-of-process frames.
             if (!frame->isLocalFrame())
                 continue;
             LocalFrame* localFrame = toLocalFrame(frame);
             LocalDOMWindow* localWindow = localFrame->localDOMWindow();
             Storage* storage = DOMWindowStorage::from(*localWindow).optionalLocalStorage();
-            if (storage && localFrame->document()->securityOrigin()->canAccess(securityOrigin) && !isEventSource(storage, sourceAreaInstance))
+            if (storage && localFrame->document()->getSecurityOrigin()->canAccess(securityOrigin) && !isEventSource(storage, sourceAreaInstance))
                 localFrame->localDOMWindow()->enqueueWindowEvent(StorageEvent::create(EventTypeNames::storage, key, oldValue, newValue, pageURL, storage));
         }
         if (InspectorDOMStorageAgent* agent = StorageNamespaceController::from(page)->inspectorAgent())
             agent->didDispatchDOMStorageEvent(key, oldValue, newValue, LocalStorage, securityOrigin);
     }
 }
 
 static Page* findPageWithSessionStorageNamespace(const WebStorageNamespace& sessionNamespace)
 {
     // Iterate over all pages that have a StorageNamespaceController supplement.
@@ skipping 12 matching lines @@
     if (!page)
         return;
 
     for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         // FIXME: We do not yet have a way to dispatch events to out-of-process frames.
         if (!frame->isLocalFrame())
             continue;
         LocalFrame* localFrame = toLocalFrame(frame);
         LocalDOMWindow* localWindow = localFrame->localDOMWindow();
         Storage* storage = DOMWindowStorage::from(*localWindow).optionalSessionStorage();
-        if (storage && localFrame->document()->securityOrigin()->canAccess(securityOrigin) && !isEventSource(storage, sourceAreaInstance))
+        if (storage && localFrame->document()->getSecurityOrigin()->canAccess(securityOrigin) && !isEventSource(storage, sourceAreaInstance))
             localFrame->localDOMWindow()->enqueueWindowEvent(StorageEvent::create(EventTypeNames::storage, key, oldValue, newValue, pageURL, storage));
     }
     if (InspectorDOMStorageAgent* agent = StorageNamespaceController::from(page)->inspectorAgent())
         agent->didDispatchDOMStorageEvent(key, oldValue, newValue, SessionStorage, securityOrigin);
 }
 
 bool StorageArea::isEventSource(Storage* storage, WebStorageArea* sourceAreaInstance)
 {
     ASSERT(storage);
     StorageArea* area = storage->area();
     return area->m_storageArea == sourceAreaInstance;
 }
 
 } // namespace blink