Replace more ObserverList with base::ObserverList.

content/browser/loader/resource_dispatcher_host_impl.cc

 // Copyright (c) 2012 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 
 #include <algorithm>
 #include <set>
@@ skipping 971 matching lines @@
   IPC_END_MESSAGE_MAP()
 
   if (!handled && IPC_MESSAGE_ID_CLASS(message.type()) == ResourceMsgStart) {
     PickleIterator iter(message);
     int request_id = -1;
     bool ok = iter.ReadInt(&request_id);
     DCHECK(ok);
     GlobalRequestID id(filter_->child_id(), request_id);
     DelegateMap::iterator it = delegate_map_.find(id);
     if (it != delegate_map_.end()) {
-      ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
+      base::ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
       ResourceMessageDelegate* delegate;
       while (!handled && (delegate = del_it.GetNext()) != NULL) {
         handled = delegate->OnMessageReceived(message);
       }
     }
 
     // As the unhandled resource message effectively has no consumer, mark it as
     // handled to prevent needless propagation through the filter pipeline.
     handled = true;
   }
@@ skipping 86 matching lines @@
             blocked_loaders_map_.end()) {
       blocked_loaders_map_[new_routing_id] =
           blocked_loaders_map_[old_routing_id];
       blocked_loaders_map_.erase(old_routing_id);
     }
   }
   if (old_request_id != new_request_id) {
     DelegateMap::iterator it = delegate_map_.find(old_request_id);
     if (it != delegate_map_.end()) {
       // Tell each delegate that the request ID has changed.
-      ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
+      base::ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
       ResourceMessageDelegate* delegate;
       while ((delegate = del_it.GetNext()) != NULL) {
         delegate->set_request_id(new_request_id);
       }
       // Now store the observer list under the new request ID.
       delegate_map_[new_request_id] = delegate_map_[old_request_id];
       delegate_map_.erase(old_request_id);
     }
   }
 
@@ skipping 1193 matching lines @@
 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id,
                                                       int request_id) const {
   return GetLoader(GlobalRequestID(child_id, request_id));
 }
 
 void ResourceDispatcherHostImpl::RegisterResourceMessageDelegate(
     const GlobalRequestID& id, ResourceMessageDelegate* delegate) {
   DelegateMap::iterator it = delegate_map_.find(id);
   if (it == delegate_map_.end()) {
     it = delegate_map_.insert(
-        std::make_pair(id, new ObserverList<ResourceMessageDelegate>)).first;
+                           std::make_pair(
+                               id,
+                               new base::ObserverList<ResourceMessageDelegate>))
+             .first;
   }
   it->second->AddObserver(delegate);
 }
 
 void ResourceDispatcherHostImpl::UnregisterResourceMessageDelegate(
     const GlobalRequestID& id, ResourceMessageDelegate* delegate) {
   DCHECK(ContainsKey(delegate_map_, id));
   DelegateMap::iterator it = delegate_map_.find(id);
   DCHECK(it->second->HasObserver(delegate));
   it->second->RemoveObserver(delegate);
@@ skipping 41 matching lines @@
 
   // Add a flag to selectively bypass the data reduction proxy if the resource
   // type is not an image.
   if (request_data.resource_type != RESOURCE_TYPE_IMAGE)
     load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY;
 
   return load_flags;
 }
 
 }  // namespace content