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

BUG=117497
TEST=WebIntentPickerControllerIncognitoBrowserTest.*


Review URL: http://codereview.chromium.org/9805005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128153 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/intents/web_intent_picker_controller.cc

@@ -123,6 +123,11 @@ void WebIntentPickerController::ShowDialog(Browser* browser,
   if (picker_shown_)
     return;
 
+  // TODO(binji): Figure out what to do when intents are invoked from incognito
+  // mode.
+  if (wrapper_->profile()->IsOffTheRecord())
+    return;
+
   picker_model_->Clear();
 
   // If picker is non-NULL, it was set by a test.

chrome/browser/ui/intents/web_intent_picker_controller.h

@@ -75,6 +75,7 @@ class WebIntentPickerController : public content::NotificationObserver,
  private:
   friend class WebIntentPickerControllerTest;
   friend class WebIntentPickerControllerBrowserTest;
+  friend class WebIntentPickerControllerIncognitoBrowserTest;
   friend class InvokingTabObserver;
 
   // Gets a notification when the return message is sent to the source tab,

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,28 @@ 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 {
+    incognito_browser_ = CreateIncognitoBrowser();
+    WebIntentPickerControllerBrowserTest::SetUpOnMainThread();
+  }
+
+  virtual Browser* GetBrowser() OVERRIDE { return incognito_browser_; }
+
+  int pending_async_count() { return controller_->pending_async_count_; }
+
+ private:
+  Browser* incognito_browser_;
+};
+
+IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerIncognitoBrowserTest,
+                       ShowDialogShouldntCrash) {
+  controller_->ShowDialog(GetBrowser(), kAction1, kType);
+  // This should do nothing for now.
+  EXPECT_EQ(0, pending_async_count());
+}