Remove the temporary scaffolding stubs.

chrome/browser/metrics/metrics_service.cc

 // Copyright (c) 2009 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.
 
 
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
@@ skipping 172 matching lines @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 #include "webkit/glue/plugins/plugin_list.h"
 
 #if !defined(OS_WIN)
 #include "base/rand_util.h"
 #endif
 
-#if defined(OS_POSIX)
-// TODO(port): Move these headers above as they are ported.
-#include "chrome/common/temp_scaffolding_stubs.h"
-#else
+// TODO(port): port browser_distribution.h.
+#if !defined(OS_POSIX)
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/external_metrics.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 
@@ skipping 1718 matching lines @@
     thread_id = PlatformThread::CurrentId();
   return PlatformThread::CurrentId() == thread_id;
 }
 
 #if defined(OS_CHROMEOS)
 void MetricsService::StartExternalMetrics(Profile* profile) {
   external_metrics_ = new chromeos::ExternalMetrics;
   external_metrics_->Start(profile);
 }
 #endif