| OLD | NEW |
| 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" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 private: | 63 private: |
| 64 virtual ~HostResolutionRequestRecorder() {} | 64 virtual ~HostResolutionRequestRecorder() {} |
| 65 | 65 |
| 66 void AddToHistory(const std::string& hostname) { | 66 void AddToHistory(const std::string& hostname) { |
| 67 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 67 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 68 requested_hostnames_.push_back(hostname); | 68 requested_hostnames_.push_back(hostname); |
| 69 if (is_waiting_for_hostname_ && waiting_for_hostname_ == hostname) { | 69 if (is_waiting_for_hostname_ && waiting_for_hostname_ == hostname) { |
| 70 is_waiting_for_hostname_ = false; | 70 is_waiting_for_hostname_ = false; |
| 71 waiting_for_hostname_.clear(); | 71 waiting_for_hostname_.clear(); |
| 72 MessageLoop::current()->Quit(); | 72 base::MessageLoop::current()->Quit(); |
| 73 } | 73 } |
| 74 } | 74 } |
| 75 | 75 |
| 76 // The hostname which WaitUntilHostHasBeenRequested is currently waiting for | 76 // The hostname which WaitUntilHostHasBeenRequested is currently waiting for |
| 77 // to be requested. | 77 // to be requested. |
| 78 std::string waiting_for_hostname_; | 78 std::string waiting_for_hostname_; |
| 79 | 79 |
| 80 // Whether WaitUntilHostHasBeenRequested is waiting for a hostname to be | 80 // Whether WaitUntilHostHasBeenRequested is waiting for a hostname to be |
| 81 // requested and thus is running a nested message loop. | 81 // requested and thus is running a nested message loop. |
| 82 bool is_waiting_for_hostname_; | 82 bool is_waiting_for_hostname_; |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |