Consolidate duplicated frame / capability structures in video_capture_types.h

media/video/capture/android/video_capture_device_android.cc

 // Copyright (c) 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 "media/video/capture/android/video_capture_device_android.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 133 matching lines @@
     return;
   }
 
   // Store current width and height.
   current_settings_.width =
       Java_VideoCapture_queryWidth(env, j_capture_.obj());
   current_settings_.height =
       Java_VideoCapture_queryHeight(env, j_capture_.obj());
   current_settings_.frame_rate =
       Java_VideoCapture_queryFrameRate(env, j_capture_.obj());
-  current_settings_.color = VideoCaptureCapability::kYV12;
+  current_settings_.color = kYV12;
   CHECK(current_settings_.width > 0 && !(current_settings_.width % 2));
   CHECK(current_settings_.height > 0 && !(current_settings_.height % 2));
 
   DVLOG(1) << "VideoCaptureDeviceAndroid::Allocate: queried width="
            << current_settings_.width
            << ", height="
            << current_settings_.height
            << ", frame_rate="
            << current_settings_.frame_rate;
   // Report the frame size to the observer.
@@ skipping 94 matching lines @@
 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) {
   LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason;
   {
     base::AutoLock lock(lock_);
     state_ = kError;
   }
   observer_->OnError();
 }
 
 }  // namespace media