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

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

Index: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
index 9dab1d2993f0a1fdc1d0a635a922a45bf55dca59..b127a1efa7a04482d583f45d83ac1053c4a5ff32 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
@@ -192,10 +192,10 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
         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_);
@@ -204,6 +204,8 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
     CreateFakeIcon();
   }
 
+  virtual Browser* GetBrowser() { return browser(); }
+
   void AddWebIntentService(const string16& action, const GURL& service_url) {
     webkit_glue::WebIntentServiceData service;
     service.action = action;
@@ -356,3 +358,25 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest,
   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.

+}