| Index: chrome/browser/content_settings/mock_settings_observer.cc
|
| diff --git a/chrome/browser/content_settings/mock_settings_observer.cc b/chrome/browser/content_settings/mock_settings_observer.cc
|
| index a281a1deb90199f3340a921cf0f7349a5e92951a..c8de7fa106c15e25f9d8f55231b294dc62bc71b1 100644
|
| --- a/chrome/browser/content_settings/mock_settings_observer.cc
|
| +++ b/chrome/browser/content_settings/mock_settings_observer.cc
|
| @@ -35,5 +35,5 @@ void MockSettingsObserver::Observe(
|
| // This checks that calling a Get function from an observer doesn't
|
| // deadlock.
|
| GURL url("http://random-hostname.com/");
|
| - map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_IMAGES, "");
|
| + map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string());
|
| }
|
|
|