Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: net/base/mock_host_resolver.cc

Issue 12473004: src/: Update the remaining include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/base/mime_util_unittest.cc ('k') | net/base/net_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/mock_host_resolver.h" 5 #include "net/base/mock_host_resolver.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/string_split.h"
15 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/strings/string_split.h"
16 #include "base/threading/platform_thread.h" 16 #include "base/threading/platform_thread.h"
17 #include "net/base/host_cache.h" 17 #include "net/base/host_cache.h"
18 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
19 #include "net/base/net_util.h" 19 #include "net/base/net_util.h"
20 #include "net/base/test_completion_callback.h" 20 #include "net/base/test_completion_callback.h"
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #include "net/base/winsock_init.h" 22 #include "net/base/winsock_init.h"
23 #endif 23 #endif
24 24
25 namespace net { 25 namespace net {
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 CHECK_EQ(old_proc, current_proc_); 408 CHECK_EQ(old_proc, current_proc_);
409 } 409 }
410 410
411 void ScopedDefaultHostResolverProc::Init(HostResolverProc* proc) { 411 void ScopedDefaultHostResolverProc::Init(HostResolverProc* proc) {
412 current_proc_ = proc; 412 current_proc_ = proc;
413 previous_proc_ = HostResolverProc::SetDefault(current_proc_); 413 previous_proc_ = HostResolverProc::SetDefault(current_proc_);
414 current_proc_->SetLastProc(previous_proc_); 414 current_proc_->SetLastProc(previous_proc_);
415 } 415 }
416 416
417 } // namespace net 417 } // namespace net
OLDNEW
« no previous file with comments | « net/base/mime_util_unittest.cc ('k') | net/base/net_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698