diff options
-rw-r--r-- | chrome/browser/extensions/extension_browsertests_misc.cc | 2 | ||||
-rw-r--r-- | chrome/renderer/extensions/chrome_app_bindings.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index f504c4f..700ab2b 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -804,7 +804,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PropertyAppIsInstalled) { host_resolver()->AddRule(nonapp_host, "127.0.0.1"); ASSERT_TRUE(test_server()->Start()); - GURL test_file_url(test_server()->GetURL("files/extensions/test_file.html")); + GURL test_file_url(test_server()->GetURL("extensions/test_file.html")); GURL::Replacements replace_host; replace_host.SetHostStr(app_host); diff --git a/chrome/renderer/extensions/chrome_app_bindings.cc b/chrome/renderer/extensions/chrome_app_bindings.cc index 401a37c..f30b4f3 100644 --- a/chrome/renderer/extensions/chrome_app_bindings.cc +++ b/chrome/renderer/extensions/chrome_app_bindings.cc @@ -48,7 +48,7 @@ class ChromeAppExtensionWrapper : public v8::Extension { !(url.SchemeIs("http") || url.SchemeIs("https"))) return v8::Boolean::New(false); - bool has_web_extent = !ExtensionRendererInfo::GetByURL(url); + bool has_web_extent = (ExtensionRendererInfo::GetByURL(url) != NULL); return v8::Boolean::New(has_web_extent); } }; |