| Index: net/tools/get_server_time/get_server_time.cc
|
| diff --git a/net/tools/get_server_time/get_server_time.cc b/net/tools/get_server_time/get_server_time.cc
|
| index f7c33f513ba83bab7bce7cc0ad107b0e57000211..70d67ad7cd28acaaa1c113deb1678b72b0f301b4 100644
|
| --- a/net/tools/get_server_time/get_server_time.cc
|
| +++ b/net/tools/get_server_time/get_server_time.cc
|
| @@ -79,14 +79,15 @@ class QuitDelegate : public net::URLFetcherDelegate {
|
| base::MessageLoop::current()->Quit();
|
| }
|
|
|
| - virtual void OnURLFetchDownloadProgress(
|
| - const net::URLFetcher* source,
|
| - int64 current, int64 total) OVERRIDE {
|
| + virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
|
| + int64 current,
|
| + int64 total) OVERRIDE {
|
| NOTREACHED();
|
| }
|
|
|
| virtual void OnURLFetchUploadProgress(const net::URLFetcher* source,
|
| - int64 current, int64 total) OVERRIDE {
|
| + int64 current,
|
| + int64 total) OVERRIDE {
|
| NOTREACHED();
|
| }
|
|
|
| @@ -114,8 +115,7 @@ class PrintingLogObserver : public net::NetLog::ThreadSafeObserver {
|
|
|
| const char* const source_type =
|
| net::NetLog::SourceTypeToString(entry.source().type);
|
| - const char* const event_type =
|
| - net::NetLog::EventTypeToString(entry.type());
|
| + const char* const event_type = net::NetLog::EventTypeToString(entry.type());
|
| const char* const event_phase =
|
| net::NetLog::EventPhaseToString(entry.phase());
|
| scoped_ptr<base::Value> params(entry.ParametersToValue());
|
| @@ -125,8 +125,8 @@ class PrintingLogObserver : public net::NetLog::ThreadSafeObserver {
|
| params_str.insert(0, ": ");
|
| }
|
|
|
| - VLOG(1) << source_type << "(" << entry.source().id << "): "
|
| - << event_type << ": " << event_phase << params_str;
|
| + VLOG(1) << source_type << "(" << entry.source().id << "): " << event_type
|
| + << ": " << event_phase << params_str;
|
| }
|
|
|
| private:
|
| @@ -134,8 +134,8 @@ class PrintingLogObserver : public net::NetLog::ThreadSafeObserver {
|
| };
|
|
|
| // Builds a URLRequestContext assuming there's only a single loop.
|
| -scoped_ptr<net::URLRequestContext>
|
| -BuildURLRequestContext(net::NetLog* net_log) {
|
| +scoped_ptr<net::URLRequestContext> BuildURLRequestContext(
|
| + net::NetLog* net_log) {
|
| net::URLRequestContextBuilder builder;
|
| #if defined(OS_LINUX)
|
| // On Linux, use a fixed ProxyConfigService, since the default one
|
| @@ -164,8 +164,8 @@ class SingleThreadRequestContextGetter : public net::URLRequestContextGetter {
|
| return context_.get();
|
| }
|
|
|
| - virtual scoped_refptr<base::SingleThreadTaskRunner>
|
| - GetNetworkTaskRunner() const OVERRIDE {
|
| + virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
|
| + const OVERRIDE {
|
| return main_task_runner_;
|
| }
|
|
|
| @@ -193,8 +193,8 @@ void EstimateServerTimeNow(base::Time server_time,
|
| *server_now = server_time + estimated_elapsed;
|
|
|
| *server_now_uncertainty =
|
| - base::TimeDelta::FromMilliseconds(kServerTimeResolutionMs) +
|
| - delta_ticks + 3 * base::TimeDelta::FromMilliseconds(kTicksResolutionMs);
|
| + base::TimeDelta::FromMilliseconds(kServerTimeResolutionMs) + delta_ticks +
|
| + 3 * base::TimeDelta::FromMilliseconds(kTicksResolutionMs);
|
| }
|
|
|
| // Assuming that the time of the server is |server_now| with
|
| @@ -227,12 +227,10 @@ int main(int argc, char* argv[]) {
|
|
|
| const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
|
| GURL url(parsed_command_line.GetSwitchValueASCII("url"));
|
| - if (!url.is_valid() ||
|
| - (url.scheme() != "http" && url.scheme() != "https")) {
|
| - std::fprintf(
|
| - stderr,
|
| - "Usage: %s --url=[http|https]://www.example.com [--v=[1|2]]\n",
|
| - argv[0]);
|
| + if (!url.is_valid() || (url.scheme() != "http" && url.scheme() != "https")) {
|
| + std::fprintf(stderr,
|
| + "Usage: %s --url=[http|https]://www.example.com [--v=[1|2]]\n",
|
| + argv[0]);
|
| return EXIT_FAILURE;
|
| }
|
|
|
| @@ -284,9 +282,9 @@ int main(int argc, char* argv[]) {
|
| end_ticks.ToInternalValue() - start_ticks.ToInternalValue();
|
| const base::TimeDelta delta_ticks = end_ticks - start_ticks;
|
|
|
| - std::printf(
|
| - "Request took %" PRId64 " ticks (%.2f ms)\n",
|
| - delta_ticks_internal, delta_ticks.InMillisecondsF());
|
| + std::printf("Request took %" PRId64 " ticks (%.2f ms)\n",
|
| + delta_ticks_internal,
|
| + delta_ticks.InMillisecondsF());
|
|
|
| const net::URLRequestStatus status = fetcher->GetStatus();
|
| if (status.status() != net::URLRequestStatus::SUCCESS) {
|
| @@ -295,8 +293,7 @@ int main(int argc, char* argv[]) {
|
| return EXIT_FAILURE;
|
| }
|
|
|
| - const net::HttpResponseHeaders* const headers =
|
| - fetcher->GetResponseHeaders();
|
| + const net::HttpResponseHeaders* const headers = fetcher->GetResponseHeaders();
|
| if (!headers) {
|
| LOG(ERROR) << "Response does not have any headers";
|
| return EXIT_FAILURE;
|
| @@ -320,8 +317,11 @@ int main(int argc, char* argv[]) {
|
|
|
| base::Time server_now;
|
| base::TimeDelta server_now_uncertainty;
|
| - EstimateServerTimeNow(server_time, start_ticks, end_ticks,
|
| - &server_now, &server_now_uncertainty);
|
| + EstimateServerTimeNow(server_time,
|
| + start_ticks,
|
| + end_ticks,
|
| + &server_now,
|
| + &server_now_uncertainty);
|
| base::Time now = base::Time::Now();
|
|
|
| std::printf(
|
| @@ -331,9 +331,12 @@ int main(int argc, char* argv[]) {
|
|
|
| base::TimeDelta skew;
|
| base::TimeDelta skew_uncertainty;
|
| - EstimateSkew(server_now, server_now_uncertainty, now,
|
| + EstimateSkew(server_now,
|
| + server_now_uncertainty,
|
| + now,
|
| base::TimeDelta::FromMilliseconds(kTimeResolutionMs),
|
| - &skew, &skew_uncertainty);
|
| + &skew,
|
| + &skew_uncertainty);
|
|
|
| std::printf(
|
| "An estimate for the local clock skew is %.2f ms with "
|
|
|