| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "components/doodle/doodle_fetcher_impl.h" | 5 #include "components/doodle/doodle_fetcher_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/time/clock.h" | |
| 11 #include "base/time/default_clock.h" | 10 #include "base/time/default_clock.h" |
| 12 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 13 #include "base/values.h" | 12 #include "base/values.h" |
| 14 #include "components/data_use_measurement/core/data_use_user_data.h" | 13 #include "components/data_use_measurement/core/data_use_user_data.h" |
| 15 #include "components/google/core/browser/google_url_tracker.h" | 14 #include "components/google/core/browser/google_url_tracker.h" |
| 16 #include "components/google/core/browser/google_util.h" | 15 #include "components/google/core/browser/google_util.h" |
| 17 #include "net/base/load_flags.h" | 16 #include "net/base/load_flags.h" |
| 18 #include "net/http/http_status_code.h" | 17 #include "net/http/http_status_code.h" |
| 19 #include "net/url_request/url_fetcher.h" | 18 #include "net/url_request/url_fetcher.h" |
| 20 | 19 |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 | 235 |
| 237 GURL DoodleFetcherImpl::GetGoogleBaseUrl() const { | 236 GURL DoodleFetcherImpl::GetGoogleBaseUrl() const { |
| 238 GURL cmd_line_url = google_util::CommandLineGoogleBaseURL(); | 237 GURL cmd_line_url = google_util::CommandLineGoogleBaseURL(); |
| 239 if (cmd_line_url.is_valid()) { | 238 if (cmd_line_url.is_valid()) { |
| 240 return cmd_line_url; | 239 return cmd_line_url; |
| 241 } | 240 } |
| 242 return google_url_tracker_->google_url(); | 241 return google_url_tracker_->google_url(); |
| 243 } | 242 } |
| 244 | 243 |
| 245 } // namespace doodle | 244 } // namespace doodle |
| OLD | NEW |