Refactor base/safe_numerics.h

content/test/mock_google_streaming_server.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/mock_google_streaming_server.h"
 
 #include "base/bind.h"
-#include "base/safe_numerics.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/values.h"
 #include "content/browser/speech/google_streaming_remote_engine.h"
 #include "content/browser/speech/proto/google_streaming_api.pb.h"
 #include "content/browser/speech/speech_recognition_manager_impl.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 
 using base::HostToNet32;
-using base::checked_numeric_cast;
+using base::checked_cast;
 
 namespace content {
 
 MockGoogleStreamingServer::MockGoogleStreamingServer(Delegate* delegate)
     : delegate_(delegate),
       kDownstreamUrlFetcherId(
           GoogleStreamingRemoteEngine::kDownstreamUrlFetcherIdForTesting),
       kUpstreamUrlFetcherId(
           GoogleStreamingRemoteEngine::kUpstreamUrlFetcherIdForTesting) {
   url_fetcher_factory_.SetDelegateForTests(this);
@@ skipping 62 matching lines @@
     const SpeechRecognitionHypothesis& hypothesis = result.hypotheses[i];
     proto_alternative->set_confidence(hypothesis.confidence);
     proto_alternative->set_transcript(base::UTF16ToUTF8(hypothesis.utterance));
   }
 
   std::string msg_string;
   proto_event.SerializeToString(&msg_string);
 
   // Prepend 4 byte prefix length indication to the protobuf message as
   // envisaged by the google streaming recognition webservice protocol.
-  uint32 prefix = HostToNet32(checked_numeric_cast<uint32>(msg_string.size()));
+  uint32 prefix = HostToNet32(checked_cast<uint32>(msg_string.size()));
   msg_string.insert(0, reinterpret_cast<char*>(&prefix), sizeof(prefix));
 
   SimulateServerResponse(true, msg_string);
 }
 
 void MockGoogleStreamingServer::SimulateServerFailure() {
   SimulateServerResponse(false, "");
 }
 
 void MockGoogleStreamingServer::SimulateMalformedResponse() {
@@ skipping 24 matching lines @@
 }
 
 // Can return NULL if the SpeechRecognizer has not requested the connection yet.
 net::TestURLFetcher* MockGoogleStreamingServer::GetURLFetcher(
     bool downstream) const {
   return url_fetcher_factory_.GetFetcherByID(
       downstream ? kDownstreamUrlFetcherId : kUpstreamUrlFetcherId);
 }
 
 }  // namespace content