Chromium Code Reviews| Index: chrome/browser/net/http_server_properties_manager.cc |
| =================================================================== |
| --- chrome/browser/net/http_server_properties_manager.cc (revision 116851) |
| +++ chrome/browser/net/http_server_properties_manager.cc (working copy) |
| @@ -1,4 +1,4 @@ |
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| #include "chrome/browser/net/http_server_properties_manager.h" |
| @@ -247,7 +247,6 @@ |
| net::HostPortPair server = net::HostPortPair::FromString(server_str); |
| if (server.host().empty()) { |
| DVLOG(1) << "Malformed http_server_properties for server: " << server_str; |
| - NOTREACHED(); |
| continue; |
| } |
| @@ -255,7 +254,6 @@ |
| if (!http_server_properties_dict.GetDictionaryWithoutPathExpansion( |
| server_str, &server_pref_dict)) { |
| DVLOG(1) << "Malformed http_server_properties server: " << server_str; |
| - NOTREACHED(); |
| continue; |
| } |
| @@ -278,7 +276,6 @@ |
| list_it != spdy_settings_list->end(); ++list_it) { |
| if ((*list_it)->GetType() != Value::TYPE_DICTIONARY) { |
| DVLOG(1) << "Malformed SpdySettingsList for server: " << server_str; |
| - NOTREACHED(); |
| continue; |
| } |
| @@ -288,7 +285,6 @@ |
| int id = 0; |
| if (!spdy_setting_dict->GetIntegerWithoutPathExpansion("id", &id)) { |
| DVLOG(1) << "Malformed id in SpdySettings for server: " << server_str; |
| - NOTREACHED(); |
| continue; |
| } |
| @@ -297,7 +293,6 @@ |
| &value)) { |
| DVLOG(1) << "Malformed value in SpdySettings for server: " << |
| server_str; |
| - NOTREACHED(); |
| continue; |
| } |
| @@ -332,7 +327,6 @@ |
| if (!port_alternate_protocol_dict->GetIntegerWithoutPathExpansion( |
| "port", &port) || (port > (1 << 16))) { |
| DVLOG(1) << "Malformed Alternate-Protocol server: " << server_str; |
| - NOTREACHED(); |
| continue; |
| } |
| int protocol = 0; |
| @@ -340,7 +334,6 @@ |
| "protocol", &protocol) || (protocol < 0) || |
| (protocol > net::NUM_ALTERNATE_PROTOCOLS)) { |
| DVLOG(1) << "Malformed Alternate-Protocol server: " << server_str; |
| - NOTREACHED(); |
| continue; |
| } |
| @@ -387,6 +380,9 @@ |
| http_server_properties_impl_->InitializePipelineCapabilities( |
| pipeline_capability_map); |
| + |
| + // Update the prefs with what we have read (delete all corrupted prefs). |
| + ScheduleUpdatePrefsOnIO(); |
|
wtc
2012/01/11 02:47:41
Is it possible to update the prefs only when we kn
ramant (doing other things)
2012/01/11 03:22:23
Many thanks for catching this.
Done.
|
| } |