Fix crash in AppNotifyChannelSetup when incognito profiles are used.

chrome/browser/extensions/extension_apitest.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/extension_apitest.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_api.h"
@@ skipping 114 matching lines @@
   return RunExtensionTestImpl(extension_name, "", kFlagNone);
 }
 
 bool ExtensionApiTest::RunExtensionTestIncognitoNoFileAccess(
     const char* extension_name) {
   return RunExtensionTestImpl(extension_name, "", kFlagEnableIncognito);
 }
 
 bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name,
                                            const std::string& page_url) {
-  DCHECK(!page_url.empty()) << "Argument page_url is required.";
-  return RunExtensionTestImpl(extension_name, page_url, kFlagEnableFileAccess);
+  return RunExtensionSubtest(extension_name, page_url, kFlagEnableFileAccess);
 }
 
-bool ExtensionApiTest::RunComponentExtensionSubtest(
-    const char* extension_name,
-    const std::string& page_url) {
+bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name,
+                                           const std::string& page_url,
+                                           int flags) {
   DCHECK(!page_url.empty()) << "Argument page_url is required.";
-  return RunExtensionTestImpl(
-      extension_name, page_url, kFlagEnableFileAccess | kFlagLoadAsComponent);
+  return RunExtensionTestImpl(extension_name, page_url, flags);
 }
 
-bool ExtensionApiTest::RunExtensionSubtestNoFileAccess(
-    const char* extension_name,
-    const std::string& page_url) {
-  DCHECK(!page_url.empty()) << "Argument page_url is required.";
-  return RunExtensionTestImpl(extension_name, page_url, kFlagNone);
-}
-
-bool ExtensionApiTest::RunExtensionSubtestIncognito(
-    const char* extension_name,
-    const std::string& page_url) {
-  DCHECK(!page_url.empty()) << "Argument page_url is required.";
-  return RunExtensionTestImpl(extension_name, page_url,
-                              kFlagEnableIncognito | kFlagEnableFileAccess);
-}
-
-bool ExtensionApiTest::RunExtensionSubtestIncognitoNoFileAccess(
-    const char* extension_name,
-    const std::string& page_url) {
-  DCHECK(!page_url.empty()) << "Argument page_url is required.";
-  return RunExtensionTestImpl(extension_name, page_url, kFlagEnableIncognito);
-}
 
 bool ExtensionApiTest::RunPageTest(const std::string& page_url) {
   return RunExtensionSubtest("", page_url);
 }
 
 bool ExtensionApiTest::RunPlatformAppTest(const char* extension_name) {
   return RunExtensionTestImpl(extension_name, "", kFlagLaunchAppShell);
 }
 
 // Load |extension_name| extension and/or |page_url| and wait for
 // PASSED or FAILED notification.
 bool ExtensionApiTest::RunExtensionTestImpl(const char* extension_name,
                                             const std::string& page_url,
                                             int flags) {
   bool enable_incognito = (flags & kFlagEnableIncognito) != 0;
   bool enable_fileaccess = (flags & kFlagEnableFileAccess) != 0;
   bool load_as_component = (flags & kFlagLoadAsComponent) != 0;
   bool launch_shell = (flags & kFlagLaunchAppShell) != 0;
+  bool use_incognito = (flags & kFlagUseIncognito) != 0;
 
   ResultCatcher catcher;
   DCHECK(!std::string(extension_name).empty() || !page_url.empty()) <<
       "extension_name and page_url cannot both be empty";
 
   const Extension* extension = NULL;
   if (!std::string(extension_name).empty()) {
     FilePath extension_path = test_data_dir_.AppendASCII(extension_name);
     if (load_as_component) {
       extension = LoadExtensionAsComponent(extension_path);
@@ skipping 14 matching lines @@
     // Note: We use is_valid() here in the expectation that the provided url
     // may lack a scheme & host and thus be a relative url within the loaded
     // extension.
     if (!url.is_valid()) {
       DCHECK(!std::string(extension_name).empty()) <<
           "Relative page_url given with no extension_name";
 
       url = extension->GetResourceURL(page_url);
     }
 
-    ui_test_utils::NavigateToURL(browser(), url);
+    if (use_incognito)
+      ui_test_utils::OpenURLOffTheRecord(browser()->profile(), url);
+    else
+      ui_test_utils::NavigateToURL(browser(), url);
 
   } else if (launch_shell) {
     Browser::OpenApplication(
         browser()->profile(),
         extension,
         extension_misc::LAUNCH_SHELL,
         GURL(),
         NEW_WINDOW);
   }
 
@@ skipping 55 matching lines @@
     return false;
 
   test_config_->SetInteger(kTestWebSocketPort, port);
   return true;
 }
 
 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   test_data_dir_ = test_data_dir_.AppendASCII("api_test");
 }