| Index: chrome/browser/search/iframe_source.cc
|
| diff --git a/chrome/browser/search/iframe_source.cc b/chrome/browser/search/iframe_source.cc
|
| index 925c97ed2c84107cfccc2c2ce7f9cf48c03f2730..b3682b8c1ff607b3b077ef0cfdf0f15b8d9950fe 100644
|
| --- a/chrome/browser/search/iframe_source.cc
|
| +++ b/chrome/browser/search/iframe_source.cc
|
| @@ -24,7 +24,8 @@ IframeSource::~IframeSource() {
|
|
|
| std::string IframeSource::GetMimeType(
|
| const std::string& path_and_query) const {
|
| - std::string path(GURL("chrome-search://host/" + path_and_query).path());
|
| + GURL url(GURL("chrome-search://host/" + path_and_query));
|
| + base::StringPiece path = url.path();
|
| if (base::EndsWith(path, ".js", base::CompareCase::INSENSITIVE_ASCII))
|
| return "application/javascript";
|
| if (base::EndsWith(path, ".png", base::CompareCase::INSENSITIVE_ASCII))
|
| @@ -38,7 +39,7 @@ std::string IframeSource::GetMimeType(
|
|
|
| bool IframeSource::ShouldServiceRequest(
|
| const net::URLRequest* request) const {
|
| - const std::string& path = request->url().path();
|
| + const std::string& path = request->url().path().as_string();
|
| return InstantIOContext::ShouldServiceRequest(request) &&
|
| request->url().SchemeIs(chrome::kChromeSearchScheme) &&
|
| request->url().host_piece() == GetSource() && ServesPath(path);
|
|
|