Make inspecting incognito extension background pages work again.

Make inspecting incognito extension background pages work again.

BUG=297856
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=243699

[Matt Perry, 2013-09-24 23:03:52]

lgtm

[Finnur, 2013-09-25 11:26:53]

LGTM

[commit-bot: I haz the power, 2013-09-25 15:06:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/24460002/3001

[commit-bot: I haz the power, 2013-09-25 18:05:24]

Retried try job too often on linux_chromeos for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-09-27 22:16:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/24460002/3001

[commit-bot: I haz the power, 2013-09-27 23:53:57]

Retried try job too often on linux_chromeos for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[Finnur, 2014-01-08 16:32:27]

Was this committed?

[not at google - send to devlin, 2014-01-08 16:39:10]

hm apparently not.

[not at google - send to devlin, 2014-01-08 16:39:50]

clicked commit but very low chance it'll actually pass :) perhaps I was going to
look into the test failures but forgot.

[commit-bot: I haz the power, 2014-01-08 16:40:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/24460002/3001

[commit-bot: I haz the power, 2014-01-08 16:40:19]

Failed to apply patch for
chrome/browser/ui/webui/extensions/extension_settings_handler.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/webui/extensions/extension_settings_handler.cc
  Hunk #1 succeeded at 796 (offset 67 lines).
  Hunk #2 FAILED at 1062.
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/ui/webui/extensions/extension_settings_handler.cc.rej

Patch:       chrome/browser/ui/webui/extensions/extension_settings_handler.cc
Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index
d9fffda9a0f4b3723e519f17af270d56cb0e11e2..dc0e1f4398a3617f65dfabc80f4876ffb4ed568e
100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -729,8 +729,10 @@ void ExtensionSettingsHandler::HandleInspectMessage(
     const Extension* extension =
         extension_service_->extensions()->GetByID(extension_id);
     DCHECK(extension);
-    devtools_util::InspectBackgroundPage(extension,
-                                         Profile::FromWebUI(web_ui()));
+    Profile* profile = Profile::FromWebUI(web_ui());
+    if (incognito)
+      profile = profile->GetOffTheRecordProfile();
+    devtools_util::InspectBackgroundPage(extension, profile);
     return;
   }
 
@@ -1060,7 +1062,8 @@ ExtensionSettingsHandler::GetInspectablePagesForExtension(
   // Repeat for the incognito process, if applicable. Don't try to get
   // shell windows for incognito processes.
   if (extension_service_->profile()->HasOffTheRecordProfile() &&
-      IncognitoInfo::IsSplitMode(extension)) {
+      IncognitoInfo::IsSplitMode(extension) &&
+      extension_service_->IsIncognitoEnabled(extension->id())) {
     ExtensionProcessManager* process_manager =
         ExtensionSystem::Get(extension_service_->profile()->
             GetOffTheRecordProfile())->process_manager();

[commit-bot: I haz the power, 2014-01-08 18:31:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/24460002/87001

[commit-bot: I haz the power, 2014-01-08 19:43:50]

Retried try job too often on win_rel for step(s) browser_tests, unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2014-01-08 19:48:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/24460002/87001

[commit-bot: I haz the power, 2014-01-08 23:54:17]

Change committed as 243699