| Index: chrome/service/cloud_print/connector_settings.cc
|
| diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/cloud_print/connector_settings.cc
|
| index 2b43b156debb9611a413514deb2bfc84e642b984..1e9b761a1c35e416165a15702d771dd71add902a 100644
|
| --- a/chrome/service/cloud_print/connector_settings.cc
|
| +++ b/chrome/service/cloud_print/connector_settings.cc
|
| @@ -32,7 +32,7 @@ ConnectorSettings::~ConnectorSettings() {
|
| void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
|
| CopyFrom(ConnectorSettings());
|
|
|
| - proxy_id_ = prefs->GetString(prefs::kCloudPrintProxyId, "");
|
| + proxy_id_ = prefs->GetString(prefs::kCloudPrintProxyId, std::string());
|
| if (proxy_id_.empty()) {
|
| proxy_id_ = PrintSystem::GenerateProxyId();
|
| prefs->SetString(prefs::kCloudPrintProxyId, proxy_id_);
|
| @@ -51,7 +51,8 @@ void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
|
| }
|
|
|
| // Check if there is an override for the cloud print server URL.
|
| - server_url_ = GURL(prefs->GetString(prefs::kCloudPrintServiceURL, ""));
|
| + server_url_ =
|
| + GURL(prefs->GetString(prefs::kCloudPrintServiceURL, std::string()));
|
| DCHECK(server_url_.is_empty() || server_url_.is_valid());
|
| if (server_url_.is_empty() || !server_url_.is_valid()) {
|
| server_url_ = GURL(kDefaultCloudPrintServerUrl);
|
|
|