Forward MIME types to BrowserPlugin when a viewer is specified.

chrome/browser/extensions/api/streams_private/streams_private_api.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/streams_private/streams_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/common/extensions/api/streams_private.h"
@@ skipping 43 matching lines @@
   extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
 
 StreamsPrivateAPI::~StreamsPrivateAPI() {
 }
 
 void StreamsPrivateAPI::ExecuteMimeTypeHandler(
     const std::string& extension_id,
     const content::WebContents* web_contents,
     scoped_ptr<content::StreamHandle> stream,
+    const std::string& view_id,
     int64 expected_content_size) {
   // Create the event's arguments value.
   streams_private::StreamInfo info;
   info.mime_type = stream->GetMimeType();
   info.original_url = stream->GetOriginalURL().spec();
   info.stream_url = stream->GetURL().spec();
-  info.tab_id = ExtensionTabUtil::GetTabId(web_contents);
+
+  if (view_id.empty()) {
+    info.tab_id.reset(new int(ExtensionTabUtil::GetTabId(web_contents)));

[not at google - send to devlin, 2014/04/30 15:42:43]

with regards to my previous comment, it's a little bit surprising to see you
only set the tab ID if there's a view ID, since if you have a |web_contents| you
*could* set the tab ID if you wanted.

perhaps it's worth just setting it, or indicating (as your response implied)
that tab_id will be deleted and |view_id| the only relevant parameter for
routing.

[Zachary Kuznia, 2014/05/01 00:38:22]

I'll go the route of always setting it.

+  } else {
+    info.view_id.reset(new std::string(view_id));
+  }
 
   int size = -1;
   if (expected_content_size <= INT_MAX)
     size = expected_content_size;
   info.expected_content_size = size;
 
   CreateResponseHeadersDictionary(stream->GetResponseHeaders().get(),
                                   &info.response_headers.additional_properties);
 
   scoped_ptr<Event> event(
@@ skipping 17 matching lines @@
 static base::LazyInstance<BrowserContextKeyedAPIFactory<StreamsPrivateAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<StreamsPrivateAPI>*
 StreamsPrivateAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 }  // namespace extensions