Salient parts of http://codereview.chromium.org/8392042/

content/browser/resource_context.cc

 // Copyright (c) 2011 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 "content/browser/resource_context.h"
 
 #include "base/logging.h"
-#include "content/browser/browser_thread.h"
 #include "content/browser/plugin_process_host.h"
+#include "content/public/browser/browser_thread.h"
 #include "webkit/database/database_tracker.h"
 
 namespace content {
 
 ResourceContext::ResourceContext()
     : host_resolver_(NULL),
       request_context_(NULL),
       appcache_service_(NULL),
       database_tracker_(NULL),
       file_system_context_(NULL),
@@ skipping 152 matching lines @@
   return media_stream_manager_;
 }
 
 void ResourceContext::set_media_stream_manager(
     media_stream::MediaStreamManager* media_stream_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   media_stream_manager_ = media_stream_manager;
 }
 
 }  // namespace content