Mark down in web intents picker controller when it is part of a TabContents that is hosting a web i…

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 204 matching lines @@
             "http://www.example.com:%d/files/extensions/intents/%%s.crx",
             host_port.port()));
     command_line->AppendSwitchASCII(
         switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     host_resolver()->AddRule("www.example.com", "127.0.0.1");
   }
 
+  content::WebContents* GetWindowDispositionTarget(
+      WebIntentPickerController* controller) {
+    return controller->window_disposition_source_;
+  }
+
   virtual void SetUpOnMainThread() OVERRIDE {
     // The FakeURLFetcherFactory will return a NULL URLFetcher if a request is
     // created for a URL it doesn't know and there is no default factory.
     // Instead, use this dummy factory to infinitely delay the request.
     default_url_fetcher_factory_.reset(new DummyURLFetcherFactory);
     fake_url_fetcher_factory_.reset(
         new net::FakeURLFetcherFactory(default_url_fetcher_factory_.get()));
 
     web_data_service_ = WebDataServiceFactory::GetForProfile(
         GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);
@@ skipping 110 matching lines @@
   intent.action = ASCIIToUTF16("a");
   intent.type = ASCIIToUTF16("b");
   IntentsDispatcherMock dispatcher(intent);
   controller_->SetIntentsDispatcher(&dispatcher);
 
   OnServiceChosen(kServiceURL2, WebIntentPickerModel::DISPOSITION_WINDOW);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL2),
             chrome::GetActiveWebContents(browser())->GetURL());
 
+  EXPECT_TRUE(NULL != GetWindowDispositionTarget(

[groby-ooo-7-16, 2012/07/30 20:10:05]

nit: Without the NULL!=?

[Greg Billock, 2012/07/30 20:23:57]

Done.

+      chrome::GetActiveTabContents(browser())->web_intent_picker_controller()));
+
   EXPECT_TRUE(dispatcher.dispatched_);
 
   OnSendReturnMessage(webkit_glue::WEB_INTENT_REPLY_SUCCESS);
   ASSERT_EQ(1, browser()->tab_count());
 }
 
 IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest,
                        FetchExtensionIcon) {
   AddWebIntentService(kAction1, kServiceURL1);
   AddWebIntentService(kAction1, kServiceURL2);
@@ skipping 258 matching lines @@
 
   EXPECT_EQ(2, picker_.num_installed_services_);
 
   // The tab is shown immediately without needing to call OnServiceChosen.
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
             chrome::GetActiveWebContents(browser())->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 }