Porting changes in chrome/{browser,common}, also enabling more unit tests....

chrome/browser/session_startup_pref.cc

 // Copyright (c) 2006-2008 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/session_startup_pref.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ skipping 19 matching lines @@
   DCHECK(prefs);
   int type = 0;
   switch(pref.type) {
     case LAST:
       type = 1;
       break;
 
     case URLS:
       type = 4;
       break;
+
+    default:

[M-A Ruel, 2008/09/19 12:51:18]

add 'NOTREACHED();' here.

[Dean McNamee, 2008/09/19 12:58:10]

That's a lie, it is reached.  It's the case of DEFAULT.

On 2008/09/19 12:51:18, M-A wrote:

[M-A Ruel, 2008/09/19 12:59:49]

Ok, don't listen to me.

On 2008/09/19 12:58:10, deanm wrote:

+      break;
   }
   prefs->SetInteger(prefs::kRestoreOnStartup, type);
 
   // Always save the URLs, that way the UI can remain consistent even if the
   // user changes the startup type pref.
   // Ownership of the ListValue retains with the pref service.
   ListValue* url_pref_list =
       prefs->GetMutableList(prefs::kURLsToRestoreOnStartup);
   DCHECK(url_pref_list);
   url_pref_list->Clear();
@@ skipping 29 matching lines @@
   }
 
   ListValue* url_pref_list = prefs->GetMutableList(
       prefs::kURLsToRestoreOnStartup);
   DCHECK(url_pref_list);
   for (size_t i = 0; i < url_pref_list->GetSize(); ++i) {
     Value* value = NULL;
     if (url_pref_list->Get(i, &value)) {
       std::wstring url_text;
       if (value->GetAsString(&url_text))
-        pref.urls.push_back(GURL(url_text));
+        pref.urls.push_back(GURL(WideToUTF8(url_text)));
     }
   }
 
   return pref;
 }