Change BufferedResourceLoader::kOK to BufferedResourceLoader::kOk.

Media code was using both. Let's follow the style guide and stick to kOk.


Review URL: http://codereview.chromium.org/10070004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132939 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 36 insertions, 36 deletions

diff --git a/webkit/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc
index 0b135c6..12f45ad 100644
--- a/webkit/media/buffered_data_source.cc
+++ b/webkit/media/buffered_data_source.cc
@@ -367,7 +367,7 @@ void BufferedDataSource::HttpInitialStartCallback(
     return;
   }
 
-  bool success = status == BufferedResourceLoader::kOK;
+  bool success = status == BufferedResourceLoader::kOk;
   if (success) {
     // TODO(hclam): Needs more thinking about supporting servers without range
     // request or their partial response is not complete.
@@ -424,7 +424,7 @@ void BufferedDataSource::NonHttpInitialStartCallback(
   }
 
   int64 instance_size = loader_->instance_size();
-  bool success = status == BufferedResourceLoader::kOK &&
+  bool success = status == BufferedResourceLoader::kOk &&
      instance_size != kPositionNotSpecified;
 
   if (success) {
@@ -468,7 +468,7 @@ void BufferedDataSource::PartialReadStartCallback(
   DCHECK(MessageLoop::current() == render_loop_);
   DCHECK(loader_.get());
 
-  if (status == BufferedResourceLoader::kOK) {
+  if (status == BufferedResourceLoader::kOk) {
     // Once the request has started successfully, we can proceed with
     // reading from it.
     ReadInternal();
@@ -497,7 +497,7 @@ void BufferedDataSource::ReadCallback(
     int bytes_read) {
   DCHECK(MessageLoop::current() == render_loop_);
 
-  if (status != BufferedResourceLoader::kOK) {
+  if (status != BufferedResourceLoader::kOk) {
     // Stop the resource load if it failed.
     loader_->Stop();
 
diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc
index ad2c6d1..2842374 100644
--- a/webkit/media/buffered_resource_loader.cc
+++ b/webkit/media/buffered_resource_loader.cc
@@ -230,7 +230,7 @@ void BufferedResourceLoader::Read(
   if (instance_size_ != kPositionNotSpecified &&
       instance_size_ <= read_position_) {
     DVLOG(1) << "Appear to have seeked beyond EOS; returning 0.";
-    DoneRead(kOK, 0);
+    DoneRead(kOk, 0);
     return;
   }
 
@@ -381,7 +381,7 @@ void BufferedResourceLoader::didReceiveResponse(
       range_supported_ = (accept_ranges.find("bytes") != std::string::npos);
 
       // If we have verified the partial response and it is correct, we will
-      // return kOK. It's also possible for a server to support range requests
+      // return kOk. It's also possible for a server to support range requests
       // without advertising "Accept-Ranges: bytes".
       if (partial_response && VerifyPartialResponse(response)) {
         range_supported_ = true;
@@ -415,7 +415,7 @@ void BufferedResourceLoader::didReceiveResponse(
   }
 
   // Calls with a successful response.
-  DoneStart(kOK);
+  DoneStart(kOk);
 }
 
 void BufferedResourceLoader::didReceiveData(
@@ -487,7 +487,7 @@ void BufferedResourceLoader::didFinishLoading(
   if (!start_cb_.is_null()) {
     DCHECK(read_cb_.is_null())
         << "Shouldn't have a read callback during start";
-    DoneStart(kOK);
+    DoneStart(kOk);
     return;
   }
 
@@ -696,7 +696,7 @@ void BufferedResourceLoader::ReadInternal() {
   offset_ += first_offset_ + read;
 
   // And report with what we have read.
-  DoneRead(kOK, read);
+  DoneRead(kOk, read);
 }
 
 // static
diff --git a/webkit/media/buffered_resource_loader.h b/webkit/media/buffered_resource_loader.h
index 462a601..a0417e5 100644
--- a/webkit/media/buffered_resource_loader.h
+++ b/webkit/media/buffered_resource_loader.h
@@ -48,7 +48,7 @@ class BufferedResourceLoader : public WebKit::WebURLLoaderClient {
   // Status codes for start/read operations on BufferedResourceLoader.
   enum Status {
     // Everything went as planned.
-    kOK,
+    kOk,
 
     // The operation failed, which may have been due to:
     //   - Page navigation
@@ -103,7 +103,7 @@ class BufferedResourceLoader : public WebKit::WebURLLoaderClient {
   // Copies |read_size| bytes from |position| into |buffer|, executing |read_cb|
   // when the operation has completed.
   //
-  // The callback will contain the number of bytes read iff the status is kOK,
+  // The callback will contain the number of bytes read iff the status is kOk,
   // zero otherwise.
   //
   // If necessary will temporarily increase forward capacity of buffer to
diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc
index d96ab37..9c91cbb 100644
--- a/webkit/media/buffered_resource_loader_unittest.cc
+++ b/webkit/media/buffered_resource_loader_unittest.cc
@@ -111,7 +111,7 @@ class BufferedResourceLoaderTest : public testing::Test {
   }
 
   void FullResponse(int64 instance_size) {
-    FullResponse(instance_size, BufferedResourceLoader::kOK);
+    FullResponse(instance_size, BufferedResourceLoader::kOk);
   }
 
   void FullResponse(int64 instance_size,
@@ -126,7 +126,7 @@ class BufferedResourceLoaderTest : public testing::Test {
     response.setHTTPStatusCode(kHttpOK);
     loader_->didReceiveResponse(url_loader_, response);
 
-    if (status == BufferedResourceLoader::kOK) {
+    if (status == BufferedResourceLoader::kOk) {
       EXPECT_EQ(instance_size, loader_->content_length());
       EXPECT_EQ(instance_size, loader_->instance_size());
     }
@@ -141,7 +141,7 @@ class BufferedResourceLoaderTest : public testing::Test {
 
   void PartialResponse(int64 first_position, int64 last_position,
                        int64 instance_size, bool chunked, bool accept_ranges) {
-    EXPECT_CALL(*this, StartCallback(BufferedResourceLoader::kOK));
+    EXPECT_CALL(*this, StartCallback(BufferedResourceLoader::kOk));
 
     WebURLResponse response(gurl_);
     response.setHTTPHeaderField(WebString::fromUTF8("Content-Range"),
@@ -402,21 +402,21 @@ TEST_F(BufferedResourceLoaderTest, BufferAndRead) {
 
   // Writes 10 bytes and read them back.
   WriteLoader(10, 10);
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 10));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
   ReadLoader(10, 10, buffer);
   VerifyBuffer(buffer, 10, 10);
 
   // Writes 10 bytes and read 2 times.
   WriteLoader(20, 10);
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 5));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 5));
   ReadLoader(20, 5, buffer);
   VerifyBuffer(buffer, 20, 5);
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 5));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 5));
   ReadLoader(25, 5, buffer);
   VerifyBuffer(buffer, 25, 5);
 
   // Read backward within buffer.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 10));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
   ReadLoader(10, 10, buffer);
   VerifyBuffer(buffer, 10, 10);
 
@@ -429,7 +429,7 @@ TEST_F(BufferedResourceLoaderTest, BufferAndRead) {
   loader_->didFinishLoading(url_loader_, 0);
 
   // Try to read 10 from position 25 will just return with 5 bytes.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 5));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 5));
   ReadLoader(25, 10, buffer);
   VerifyBuffer(buffer, 25, 5);
 
@@ -438,7 +438,7 @@ TEST_F(BufferedResourceLoaderTest, BufferAndRead) {
   ReadLoader(5, 10, buffer);
 
   // Try to read beyond the instance size.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 0));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 0));
   ReadLoader(30, 10, buffer);
 }
 
@@ -459,7 +459,7 @@ TEST_F(BufferedResourceLoaderTest, ReadExtendBuffer) {
   // Write more than forward capacity and read it back. Ensure forward capacity
   // gets reset.
   WriteLoader(10, 20);
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 20));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 20));
   ReadLoader(10, 20, buffer);
 
   VerifyBuffer(buffer, 10, 20);
@@ -472,7 +472,7 @@ TEST_F(BufferedResourceLoaderTest, ReadExtendBuffer) {
   ConfirmLoaderBufferForwardCapacity(20);
 
   // Fulfill outstanding request. Ensure forward capacity gets reset.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 20));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 20));
   WriteLoader(30, 20);
 
   VerifyBuffer(buffer, 30, 20);
@@ -512,7 +512,7 @@ TEST_F(BufferedResourceLoaderTest, ReadOutsideBuffer) {
   ReadLoader(10, 10, buffer);
 
   // Writing to loader will fulfill the read request.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 10));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
   WriteLoader(10, 20);
   VerifyBuffer(buffer, 10, 10);
 
@@ -520,7 +520,7 @@ TEST_F(BufferedResourceLoaderTest, ReadOutsideBuffer) {
   ReadLoader(25, 10, buffer);
 
   EXPECT_CALL(*this, NetworkCallback());
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 5));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 5));
   loader_->didFinishLoading(url_loader_, 0);
 }
 
@@ -601,7 +601,7 @@ TEST_F(BufferedResourceLoaderTest, ReadThenDeferStrategy) {
 
   // As soon as we have received enough data to fulfill the read, defer.
   EXPECT_CALL(*this, NetworkCallback());
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 10));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
   WriteLoader(19, 1);
 
   ConfirmLoaderDeferredState(true);
@@ -616,7 +616,7 @@ TEST_F(BufferedResourceLoaderTest, ReadThenDeferStrategy) {
 
   // Over-fulfill requested bytes, then deferring should be enabled again.
   EXPECT_CALL(*this, NetworkCallback());
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 10));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
   WriteLoader(20, 40);
 
   ConfirmLoaderDeferredState(true);
@@ -631,7 +631,7 @@ TEST_F(BufferedResourceLoaderTest, ReadThenDeferStrategy) {
 
   // Fulfill requested bytes, then deferring should be enabled again.
   EXPECT_CALL(*this, NetworkCallback());
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 10));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
   WriteLoader(60, 40);
 
   ConfirmLoaderDeferredState(true);
@@ -663,12 +663,12 @@ TEST_F(BufferedResourceLoaderTest, ThresholdDeferStrategy) {
   ConfirmLoaderDeferredState(true);
 
   // Read a little from the buffer: keep deferring.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 2));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 2));
   ReadLoader(10, 2, buffer);
   ConfirmLoaderDeferredState(true);
 
   // Read a little more and go under threshold: stop deferring.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 4));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 4));
   EXPECT_CALL(*this, NetworkCallback());
   ReadLoader(12, 4, buffer);
   ConfirmLoaderDeferredState(false);
@@ -679,7 +679,7 @@ TEST_F(BufferedResourceLoaderTest, ThresholdDeferStrategy) {
   ConfirmLoaderDeferredState(true);
 
   // Read a little from the buffer: keep deferring.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 4));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 4));
   ReadLoader(16, 4, buffer);
   ConfirmLoaderDeferredState(true);
 
@@ -697,7 +697,7 @@ TEST_F(BufferedResourceLoaderTest, Tricky_ReadForwardsPastBuffered) {
 
   // PRECONDITION
   WriteUntilThreshold();
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 4));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 4));
   ReadLoader(10, 4, buffer);
   ConfirmBufferState(4, 10, 6, 10);
   ConfirmLoaderOffsets(14, 0, 0);
@@ -724,7 +724,7 @@ TEST_F(BufferedResourceLoaderTest, Tricky_ReadForwardsPastBuffered) {
   ConfirmLoaderDeferredState(false);
 
   // Write the rest, read should complete.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 4));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 4));
   WriteData(2);
   ConfirmLoaderDeferredState(false);
 
@@ -812,7 +812,7 @@ TEST_F(BufferedResourceLoaderTest, Tricky_SmallReadWithinThreshold) {
   ConfirmLoaderDeferredState(false);
 
   // Write the rest, read should complete.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 4));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 4));
   WriteData(4);
   ConfirmLoaderDeferredState(false);
 
@@ -871,7 +871,7 @@ TEST_F(BufferedResourceLoaderTest, Tricky_LargeReadWithinThreshold) {
   ConfirmLoaderDeferredState(false);
 
   // Write the rest, read should complete and capacity should go back to normal.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 12));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 12));
   WriteData(6);
   ConfirmLoaderBufferForwardCapacity(10);
   ConfirmLoaderDeferredState(false);
@@ -895,7 +895,7 @@ TEST_F(BufferedResourceLoaderTest, Tricky_LargeReadBackwards) {
 
   // PRECONDITION
   WriteUntilThreshold();
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 10));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
   EXPECT_CALL(*this, NetworkCallback());
   ReadLoader(10, 10, buffer);
   WriteUntilThreshold();
@@ -934,7 +934,7 @@ TEST_F(BufferedResourceLoaderTest, Tricky_LargeReadBackwards) {
   ConfirmLoaderDeferredState(false);
 
   // Write the rest, read should complete and capacity should go back to normal.
-  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOK, 18));
+  EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 18));
   WriteData(2);
   ConfirmLoaderBufferForwardCapacity(10);
   ConfirmLoaderDeferredState(false);