summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 18:28:47 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 18:28:47 +0000
commit84c4eb3414d064cd1a836451b04cab3659528c0e (patch)
tree6c33f7991562ac3931f785bd982e3b72018396b0 /chrome/browser/extensions
parent3ee4b5348e0f213c31cc5cc5380bec88f2345f06 (diff)
downloadchromium_src-84c4eb3414d064cd1a836451b04cab3659528c0e.zip
chromium_src-84c4eb3414d064cd1a836451b04cab3659528c0e.tar.gz
chromium_src-84c4eb3414d064cd1a836451b04cab3659528c0e.tar.bz2
Enable ExtensionApiTest.Toolstrip and add additional debug output.
This output is testing the prospect that the cause of the flakiness is a race to the IO thread between the renderer that is requesting a chrome-extension page and the message to insert the correct mapping to service the request. BUG=22668 Review URL: http://codereview.chromium.org/251025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_protocols.cc4
-rw-r--r--chrome/browser/extensions/extension_toolstrip_apitest.cc3
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index 3a31b0e..3ff9c51 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -21,8 +21,10 @@ static URLRequestJob* CreateExtensionURLRequestJob(URLRequest* request,
// chrome-extension://extension-id/resource/path.js
FilePath directory_path = context->GetPathForExtension(request->url().host());
- if (directory_path.value().empty())
+ if (directory_path.value().empty()) {
+ LOG(WARNING) << "Failed to GetPathForExtension: " << request->url().host();
return NULL;
+ }
std::string resource = request->url().path();
FilePath path = Extension::GetResourcePath(directory_path, resource);
diff --git a/chrome/browser/extensions/extension_toolstrip_apitest.cc b/chrome/browser/extensions/extension_toolstrip_apitest.cc
index 8bcd08d..b4d4c4b 100644
--- a/chrome/browser/extensions/extension_toolstrip_apitest.cc
+++ b/chrome/browser/extensions/extension_toolstrip_apitest.cc
@@ -4,8 +4,9 @@
#include "chrome/browser/extensions/extension_apitest.h"
+// TEMPORARILY ENABLED TO GET DEBUG OUTPUT:
// TODO(rafaelw,erikkay) disabled due to flakiness
// BUG=22668 (probably the same bug)
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Toolstrip) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Toolstrip) {
ASSERT_TRUE(RunExtensionTest("toolstrip")) << message_;
}