Refactor some method names in media::Status

and

media: :Status::IsOk() => media::Status::is_ok()
media: :Status::Ok() => media::OkStatus()
Change-Id: I94d09a860513e0c3efb54da392e56d3035dfddee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2106740Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Frank Liberato <liberato@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751075}

media/base/media_serializers.h

@@ -358,16 +358,16 @@ struct MediaSerializer<media::StatusCode> {
 // Class (complex)
 template <>
 struct MediaSerializer<media::Status> {
-  static base::Value Serialize(const media::Status& err) {
-    if (err.IsOk())
+  static base::Value Serialize(const media::Status& status) {
+    if (status.is_ok())
       return base::Value("Ok");
 
     base::Value result(base::Value::Type::DICTIONARY);
-    FIELD_SERIALIZE("status_code", err.code());
-    FIELD_SERIALIZE("status_message", err.message());
-    FIELD_SERIALIZE("stack", err.data_->frames);
-    FIELD_SERIALIZE("data", err.data_->data);
-    FIELD_SERIALIZE("causes", err.data_->causes);
+    FIELD_SERIALIZE("status_code", status.code());
+    FIELD_SERIALIZE("status_message", status.message());
+    FIELD_SERIALIZE("stack", status.data_->frames);
+    FIELD_SERIALIZE("data", status.data_->data);
+    FIELD_SERIALIZE("causes", status.data_->causes);
     return result;
   }
 };

media/base/status.cc

@@ -25,7 +25,7 @@ Status::Status(const Status& copy) {
 }
 
 Status& Status::operator=(const Status& copy) {
-  if (copy.IsOk()) {
+  if (copy.is_ok()) {
     data_.reset();
     return *this;
   }
@@ -69,4 +69,8 @@ void Status::AddFrame(const base::Location& location) {
   data_->frames.push_back(MediaSerialize(location));
 }
 
+Status OkStatus() {
+  return Status();
+}
+
 }  // namespace media

media/base/status.h

@@ -40,11 +40,6 @@ class StatusDataView;
 // successful returns.
 class MEDIA_EXPORT Status {
  public:
-  // Convenience function to return |kOk|.
-  // OK won't have a message, trace, or data associated with them, and DCHECK
-  // if they are added.
-  static Status Ok() { return Status(); }
-
   // Default constructor can be used for Status::Ok();
   Status();
 
@@ -69,7 +64,7 @@ class MEDIA_EXPORT Status {
   // Needs an out of line destructor...
   ~Status();
 
-  bool IsOk() const { return !data_; }
+  bool is_ok() const { return !data_; }
 
   // Getters for internal fields
   const std::string& message() const {
@@ -148,6 +143,11 @@ class MEDIA_EXPORT Status {
   std::unique_ptr<StatusInternal> data_;
 };
 
+// Convenience function to return |kOk|.
+// OK won't have a message, trace, or data associated with them, and DCHECK
+// if they are added.
+MEDIA_EXPORT Status OkStatus();
+
 // We need this two step macro to allow calling with no extra args - in a single
 // step macro we would have no way of removing the trailing comma after the
 // code.

media/base/status_unittest.cc

@@ -36,7 +36,7 @@ struct MediaSerializer<UselessThingToBeSerialized> {
 // Friend class of MediaLog for access to internal constants.
 class StatusTest : public testing::Test {
  public:
-  Status DontFail() { return Status::Ok(); }
+  Status DontFail() { return OkStatus(); }
 
   Status FailEasily() { return STATUS(kCodeOnlyForTesting, "Message"); }
 

media/gpu/windows/d3d11_texture_wrapper.cc

@@ -73,7 +73,7 @@ bool DefaultTexture2DWrapper::ProcessTexture(
   // TODO(liberato): Would be nice if SB<> knew how to post and reply, so that
   // we could get the error code back eventually, and fail later with it.
   auto result = gpu_resources_->PushNewTexture(std::move(texture), array_slice);
-  if (!result.IsOk())
+  if (!result.is_ok())
     return false;
 
   // TODO(liberato): make sure that |mailbox_holders_| is zero-initialized in
@@ -254,7 +254,7 @@ Status DefaultTexture2DWrapper::GpuResources::PushNewTexture(
   if (!eglStreamConsumerAcquireKHR(egl_display, stream_))
     return Status(StatusCode::kCouldNotPostAcquireStream);
 
-  return Status::Ok();
+  return OkStatus();
 }
 
 }  // namespace media

media/mojo/mojom/status_mojom_traits.h

@@ -21,28 +21,28 @@ struct StructTraits<media::mojom::StatusDataView, media::Status> {
   }
 
   static base::Optional<std::string> message(const media::Status& input) {
-    if (input.IsOk())
+    if (input.is_ok())
       return base::nullopt;
     DCHECK(input.data_);
     return input.message();
   }
 
   static base::span<base::Value> frames(const media::Status& input) {
-    if (input.IsOk())
+    if (input.is_ok())
       return {};
     DCHECK(input.data_);
     return input.data_->frames;
   }
 
   static base::span<media::Status> causes(const media::Status& input) {
-    if (input.IsOk())
+    if (input.is_ok())
       return {};
     DCHECK(input.data_);
     return input.data_->causes;
   }
 
   static base::Optional<base::Value> data(const media::Status& input) {
-    if (!input.IsOk()) {
+    if (!input.is_ok()) {
       DCHECK(input.data_);
       return input.data_->data.Clone();
     }