[Web Intents] Fix crash when invoking intent in incognito mode.

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 "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
@@ skipping 174 matching lines @@
 
   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 FakeURLFetcherFactory(default_url_fetcher_factory_.get()));
 
     web_data_service_ =
-        browser()->profile()->GetWebDataService(Profile::EXPLICIT_ACCESS);
+        GetBrowser()->profile()->GetWebDataService(Profile::EXPLICIT_ACCESS);
     favicon_service_ =
-        browser()->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
-    controller_ = browser()->
+        GetBrowser()->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
+    controller_ = GetBrowser()->
         GetSelectedTabContentsWrapper()->web_intent_picker_controller();
 
     controller_->set_picker(&picker_);
     controller_->set_model_observer(&picker_);
 
     CreateFakeIcon();
   }
 
+  virtual Browser* GetBrowser() { return browser(); }
+
   void AddWebIntentService(const string16& action, const GURL& service_url) {
     webkit_glue::WebIntentServiceData service;
     service.action = action;
     service.type = kType;
     service.service_url = service_url;
     web_data_service_->AddWebIntentService(service);
   }
 
   void AddCWSExtensionServiceEmpty(const string16& action) {
     GURL cws_query_url = CWSIntentsRegistry::BuildQueryURL(action, kType);
@@ skipping 132 matching lines @@
   ASSERT_EQ(3, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
             browser()->GetSelectedWebContents()->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 
   OnSendReturnMessage(webkit_glue::WEB_INTENT_REPLY_SUCCESS);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(original, browser()->GetSelectedWebContents()->GetURL());
 }
+
+class WebIntentPickerControllerIncognitoBrowserTest :
+    public WebIntentPickerControllerBrowserTest {
+ public:
+  WebIntentPickerControllerIncognitoBrowserTest() {}
+
+  virtual void SetUpOnMainThread() OVERRIDE {

[groby-ooo-7-16, 2012/03/22 00:20:24]

Can we just have a WebIntentPickerControllerBrowserTest and pass the browser in
at  SetupOnMainThread?

[binji, 2012/03/22 00:38:40]

I can't change the signature of SetUpOnMainThread, it is declared in
InProcessBrowserTest. This seemed the easiest way to keep most of the setup.

+    incognito_browser_ = CreateIncognitoBrowser();
+    WebIntentPickerControllerBrowserTest::SetUpOnMainThread();
+  }
+
+  virtual Browser* GetBrowser() OVERRIDE { return incognito_browser_; }
+
+ private:
+  Browser* incognito_browser_;
+};
+
+IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerIncognitoBrowserTest,
+                       ShowDialogShouldntCrash) {
+  controller_->ShowDialog(GetBrowser(), kAction1, kType);
+  // This should do nothing for now.

[groby-ooo-7-16, 2012/03/22 00:20:24]

Does this test even work? It seems we never call the real picker anyways, just
the mock?

(We could test via side effects - if we don't early out, the async_call_pending
should be non-zero)

[binji, 2012/03/22 00:38:40]

The crash is in the picker controller, not the picker. But I can add a simple
pending_async_count test.

+}