Fix crash in AppNotifyChannelSetup when incognito profiles are used.

chrome/browser/extensions/extension_apitest.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_
 #pragma once
 
 #include <deque>
 #include <string>
@@ skipping 14 matching lines @@
 // (1) Setup initial browser state (e.g. create some bookmarks for the
 //     bookmark test)
 // (2) Call ASSERT_TRUE(RunExtensionTest(name));
 // (3) In your extension code, run your test and call chrome.test.pass or
 //     chrome.test.fail
 // (4) Verify expected browser state.
 // TODO(erikkay): There should also be a way to drive events in these tests.
 
 class ExtensionApiTest : public ExtensionBrowserTest {
  public:
+  // Flags used to configure how the tests are run.
+  enum Flags {
+    kFlagNone = 0,
+
+    // Allow the extension to run in incognito mode.
+    kFlagEnableIncognito = 1 << 0,
+
+    // Launch the test page in an incognito window.
+    kFlagUseIncognito = 1 << 1,
+
+    // Allow file access for the extension.
+    kFlagEnableFileAccess = 1 << 2,
+
+    // Loads the extension with location COMPONENT.
+    kFlagLoadAsComponent = 1 << 3,
+
+    // Launch the extension in a platform app shell.
+    kFlagLaunchAppShell = 1 << 4
+  };
+
   ExtensionApiTest();
   virtual ~ExtensionApiTest();
 
  protected:
   // Helper class that observes tests failing or passing. Observation starts
   // when the class is constructed. Get the next result by calling
   // GetNextResult() and message() if GetNextResult() return false. If there
   // are no results, this method will pump the UI message loop until one is
   // received.
   class ResultCatcher : public content::NotificationObserver {
@@ skipping 51 matching lines @@
   bool RunExtensionTestIncognitoNoFileAccess(const char* extension_name);
 
   // If not empty, Load |extension_name|, load |page_url| and wait for pass /
   // fail notification from the extension API on the page. Note that if
   // |page_url| is not a valid url, it will be treated as a resource within
   // the extension. |extension_name| is a directory in
   // "test/data/extensions/api_test".
   bool RunExtensionSubtest(const char* extension_name,
                            const std::string& page_url);
 
-  // Same as RunExtensionSubtest, but loads extension as component.
-  bool RunComponentExtensionSubtest(const char* extension_name,
-                                    const std::string& page_url);
-
-  // Same as RunExtensionSubtest, but disables file access.
-  bool RunExtensionSubtestNoFileAccess(const char* extension_name,
-                                       const std::string& page_url);
-
-  // Same as RunExtensionSubtest, but enables the extension for incognito mode.
-  bool RunExtensionSubtestIncognito(const char* extension_name,
-                                    const std::string& page_url);
-
-  // Same as RunExtensionSubtestIncognito, but disables file access.
-  bool RunExtensionSubtestIncognitoNoFileAccess(const char* extension_name,
-                                                const std::string& page_url);
+  // Same as RunExtensionSubtest, except run with the specific |flags|.
+  bool RunExtensionSubtest(const char* extension_name,
+                           const std::string& page_url,
+                           int flags);
 
   // Load |page_url| and wait for pass / fail notification from the extension
   // API on the page.
   bool RunPageTest(const std::string& page_url);
 
   // Similar to RunExtensionTest, except used for running tests in platform app
   // shell windows.
   bool RunPlatformAppTest(const char* extension_name);
 
   // Start the test server, and store details of its state.  Those details
   // will be available to javascript tests using chrome.test.getConfig().
   bool StartTestServer();
 
   // Start the test WebSocket server, and store details of its state. Those
   // details will be available to javascript tests using
   // chrome.test.getConfig().
   bool StartWebSocketServer(const FilePath& root_directory);
 
   // Test that exactly one extension loaded.  If so, return a pointer to
   // the extension.  If not, return NULL and set message_.
   const Extension* GetSingleLoadedExtension();
 
   // All extensions tested by ExtensionApiTest are in the "api_test" dir.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
   // If it failed, what was the error message?
   std::string message_;
 
  private:
-  enum Flags {
-    kFlagNone = 0,
-    kFlagEnableIncognito = 1 << 0,
-    kFlagEnableFileAccess = 1 << 1,
-    kFlagLoadAsComponent = 1 << 2,
-    kFlagLaunchAppShell = 1 << 3
-  };
   bool RunExtensionTestImpl(const char* extension_name,
                             const std::string& test_page,
                             int flags);
 
   // Hold details of the test, set in C++, which can be accessed by
   // javascript using chrome.test.getConfig().
   scoped_ptr<DictionaryValue> test_config_;
 
   // Hold the test WebSocket server.
   scoped_ptr<ui_test_utils::TestWebSocketServer> websocket_server_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_