Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2)

net/proxy/init_proxy_resolver.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_PROXY_INIT_PROXY_RESOLVER_H_
 #define NET_PROXY_INIT_PROXY_RESOLVER_H_
 #pragma once
 
 #include <vector>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_api.h"
 #include "net/base/net_log.h"
 
 namespace net {
 
 class DhcpProxyScriptFetcher;
 class NetLogParameter;
 class ProxyConfig;
@@ skipping 133 matching lines @@
   base::OneShotTimer<InitProxyResolver> wait_timer_;
 
   ProxyConfig* effective_config_;
 
   DISALLOW_COPY_AND_ASSIGN(InitProxyResolver);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_INIT_PROXY_RESOLVER_H_