Refactor the VideoCaptureDevice::Name struct.

media/video/capture/win/video_capture_device_mf_win.cc

 // Copyright (c) 2012 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/win/video_capture_device_mf_win.h"
 
 #include <mfapi.h>
 #include <mferror.h>
 
 #include "base/lazy_instance.h"
@@ skipping 250 matching lines @@
   HRESULT hr;
   for (UINT32 i = 0; i < count; ++i) {
     UINT32 name_size, id_size;
     ScopedCoMem<wchar_t> name, id;
     if (SUCCEEDED(hr = devices[i]->GetAllocatedString(
             MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, &name, &name_size)) &&
         SUCCEEDED(hr = devices[i]->GetAllocatedString(
             MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, &id,
             &id_size))) {
       std::wstring name_w(name, name_size), id_w(id, id_size);
-      Name device;
-      device.device_name = base::SysWideToUTF8(name_w);
-      device.unique_id = base::SysWideToUTF8(id_w);
+      Name device(base::SysWideToUTF8(name_w), base::SysWideToUTF8(id_w));
       device_names->push_back(device);
     } else {
       DLOG(WARNING) << "GetAllocatedString failed: " << std::hex << hr;
     }
     devices[i]->Release();
   }
 }
 
 VideoCaptureDeviceMFWin::VideoCaptureDeviceMFWin(const Name& device_name)
     : name_(device_name), observer_(NULL), capture_(0) {
   DetachFromThread();
 }
 
 VideoCaptureDeviceMFWin::~VideoCaptureDeviceMFWin() {
   DCHECK(CalledOnValidThread());
 }
 
 bool VideoCaptureDeviceMFWin::Init() {
   DCHECK(CalledOnValidThread());
   DCHECK(!reader_);
 
   ScopedComPtr<IMFMediaSource> source;
-  if (!CreateVideoCaptureDevice(name_.unique_id.c_str(), source.Receive()))
+  if (!CreateVideoCaptureDevice(name_.id().c_str(), source.Receive()))
     return false;
 
   ScopedComPtr<IMFAttributes> attributes;
   MFCreateAttributes(attributes.Receive(), 1);
   DCHECK(attributes);
 
   callback_ = new MFReaderCallback(this);
   attributes->SetUnknown(MF_SOURCE_READER_ASYNC_CALLBACK, callback_.get());
 
   return SUCCEEDED(MFCreateSourceReaderFromMediaSource(source, attributes,
@@ skipping 123 matching lines @@
   }
 }
 
 void VideoCaptureDeviceMFWin::OnError(HRESULT hr) {
   DLOG(ERROR) << "VideoCaptureDeviceMFWin: " << std::hex << hr;
   if (observer_)
     observer_->OnError();
 }
 
 }  // namespace media