Coverity: Remove default TabCaptureRequest constructor.

chrome/browser/extensions/api/tab_capture/tab_capture_registry.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 "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
 
+#include <utility>
+
 #include "content/public/browser/browser_thread.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/media/media_internals.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 53 matching lines @@
     default:
       // TODO(justinlin): Implement muted state notification.
       break;
   }
 
   if (state == tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_NONE) {
     // This is a state we don't handle.
     return;
   }
 
-  TabCaptureRegistry::TabCaptureRequest& request_info = requests_[key];
+  TabCaptureRegistry::TabCaptureRequest& request_info =
+      requests_.find(key)->second;

[Matt Perry, 2013/01/04 21:17:18]

This is not the same as the old code. If |key| is not in the map, this version
will crash.

[justinlin, 2013/01/04 22:10:52]

Done. Right, there's a check above to make sure the key exists first though.
Made that more clear.

   request_info.status = state;
 
   scoped_ptr<tab_capture::CaptureInfo> info(new tab_capture::CaptureInfo());
   info->tab_id = request_info.tab_id;
   info->status = request_info.status;
 
   scoped_ptr<base::ListValue> args(new ListValue());
   args->Append(info->ToValue().release());
   scoped_ptr<Event> event(new Event(
       events::kOnTabCaptureStatusChanged, args.Pass()));
@@ skipping 32 matching lines @@
         }
       }
       break;
     }
   }
 }
 
 bool TabCaptureRegistry::AddRequest(const std::pair<int, int> key,
                                     const TabCaptureRequest& request) {
   // Currently, we do not allow multiple active captures for same tab.
-  if (requests_.find(key) != requests_.end())
-    if (requests_[key].status !=
-        tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_STOPPED &&
-        requests_[key].status !=
-        tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_ERROR)
+  DeviceCaptureRequestMap::iterator it = requests_.find(key);
+  if (it != requests_.end()) {
+    tab_capture::TabCaptureState state = it->second.status;

[kmadhusu, 2013/01/04 21:01:01]

You can avoid copying by using a const ref.

[justinlin, 2013/01/04 22:10:52]

Done.

+    if (state != tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_STOPPED &&
+        state != tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_ERROR)
       return false;
-  requests_[key] = request;
+  }
+  requests_.insert(std::make_pair(key, request));
   return true;
 }
 
 bool TabCaptureRegistry::VerifyRequest(int render_process_id,
                                        int render_view_id) {
   return requests_.find(std::make_pair(
       render_process_id, render_view_id)) != requests_.end();
 }
 
 void TabCaptureRegistry::MediaObserverProxy::Attach(
@@ skipping 47 matching lines @@
     const content::MediaStreamDevice& device,
     const content::MediaRequestState new_state) {
   if (handler_)
     handler_->HandleRequestUpdateOnUIThread(render_process_id,
                                             render_view_id,
                                             device,
                                             new_state);
 }
 
 }  // namespace extensions