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

Side by Side Diff: chrome/browser/net/predictor_browsertest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (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
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 "base/json/json_string_value_serializer.h" 5 #include "base/json/json_string_value_serializer.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "chrome/browser/net/predictor.h" 7 #include "chrome/browser/net/predictor.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "chrome/test/base/in_process_browser_test.h" 11 #include "chrome/test/base/in_process_browser_test.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "net/base/host_resolver_proc.h"
14 #include "net/base/mock_host_resolver.h"
15 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/dns/host_resolver_proc.h"
15 #include "net/dns/mock_host_resolver.h"
16 #include "testing/gmock/include/gmock/gmock.h" 16 #include "testing/gmock/include/gmock/gmock.h"
17 17
18 using content::BrowserThread; 18 using content::BrowserThread;
19 using testing::HasSubstr; 19 using testing::HasSubstr;
20 20
21 namespace { 21 namespace {
22 22
23 // Records a history of all hostnames for which resolving has been requested, 23 // Records a history of all hostnames for which resolving has been requested,
24 // and immediately fails the resolution requests themselves. 24 // and immediately fails the resolution requests themselves.
25 class HostResolutionRequestRecorder : public net::HostResolverProc { 25 class HostResolutionRequestRecorder : public net::HostResolverProc {
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 // But also make sure this data has been first loaded into the Predictor, by 179 // But also make sure this data has been first loaded into the Predictor, by
180 // inspecting that the Predictor starts making the expected hostname requests. 180 // inspecting that the Predictor starts making the expected hostname requests.
181 PrepareFrameSubresources(referring_url_); 181 PrepareFrameSubresources(referring_url_);
182 WaitUntilHostHasBeenRequested(startup_url_.host()); 182 WaitUntilHostHasBeenRequested(startup_url_.host());
183 WaitUntilHostHasBeenRequested(target_url_.host()); 183 WaitUntilHostHasBeenRequested(target_url_.host());
184 } 184 }
185 185
186 } // namespace chrome_browser_net 186 } // namespace chrome_browser_net
187 187
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698