Moved ownership of camera thread to user image screen

chrome/browser/chromeos/login/user_image_screen.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/login/user_image_screen.h"
 
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
@@ skipping 13 matching lines @@
 const int kFrameWidth = 480;
 const int kFrameHeight = 480;
 
 // Maximum number of capture failures we ignore before we try to initialize
 // the camera again.
 const int kMaxCaptureFailureCounter = 5;
 
 // Maximum number of camera initialization retries.
 const int kMaxCameraInitFailureCounter = 3;
 
+// Name for camera thread.
+const char kCameraThreadName[] = "Chrome_CameraThread";
+
 }  // namespace
 
 UserImageScreen::UserImageScreen(WizardScreenDelegate* delegate)
     : ViewScreen<UserImageView>(delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(camera_(new Camera(this, true))),
       capture_failure_counter_(0),
-      camera_init_failure_counter_(0) {
+      camera_init_failure_counter_(0),
+      camera_thread_(kCameraThreadName) {
   registrar_.Add(
       this,
       NotificationType::SCREEN_LOCK_STATE_CHANGED,
       NotificationService::AllSources());
+  camera_thread_.Start();
+  camera_ = new Camera(this, &camera_thread_, true);
   camera_->Initialize(kFrameWidth, kFrameHeight);
 }
 
 UserImageScreen::~UserImageScreen() {
   if (camera_.get())
     camera_->set_delegate(NULL);
 }
 
 void UserImageScreen::Refresh() {
 }
@@ skipping 92 matching lines @@
 
   bool is_screen_locked = *Details<bool>(details).ptr();
   if (is_screen_locked)
     camera_->Uninitialize();
   else
     camera_->Initialize(kFrameWidth, kFrameHeight);
 }
 
 }  // namespace chromeos