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

chrome/browser/google_url_tracker.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/google_url_tracker.h"
 
+#include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "net/base/load_flags.h"
 
 const char GoogleURLTracker::kDefaultGoogleHomepage[] =
     "http://www.google.com/";
 
 GoogleURLTracker::GoogleURLTracker()
-    : google_url_(g_browser_process->local_state()->GetString(
-          prefs::kLastKnownGoogleURL)),
-#pragma warning(suppress: 4355)  // Okay to pass "this" here.
-      fetcher_factory_(this),
+    : google_url_(WideToUTF8(g_browser_process->local_state()->GetString(
+          prefs::kLastKnownGoogleURL))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(fetcher_factory_(this)),
       in_startup_sleep_(true),
       already_fetched_(false),
       need_to_fetch_(false),
       request_context_available_(!!Profile::GetDefaultRequestContext()) {
   NotificationService::current()->AddObserver(this,
       NOTIFY_DEFAULT_REQUEST_CONTEXT_AVAILABLE,
       NotificationService::AllSources());
 
   // Because this function can be called during startup, when kicking off a URL
   // fetch can eat up 20 ms of time, we delay five seconds, which is hopefully
@@ skipping 129 matching lines @@
   }
 }
 
 void GoogleURLTracker::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   DCHECK_EQ(NOTIFY_DEFAULT_REQUEST_CONTEXT_AVAILABLE, type);
   request_context_available_ = true;
   StartFetchIfDesirable();
 }