0

Cleanup: Remove unneeded base/file_util.h includes in content.

Review URL: https://chromiumcodereview.appspot.com/14606009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199918 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
thestig@chromium.org
2013-05-14 05:29:02 +00:00
parent 0e19671783
commit e6fec476d1
28 changed files with 23 additions and 40 deletions

@ -12,7 +12,6 @@
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/debug/trace_event.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/string_util.h"

@ -6,6 +6,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "content/public/browser/trace_controller.h"
#include "jni/TracingIntentHandler_jni.h"

@ -2,13 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_BROWSER_ANDROID_TRACING_INTENT_HANDLER_H
#define CONTENT_BROWSER_ANDROID_TRACING_INTENT_HANDLER_H
#ifndef CONTENT_BROWSER_ANDROID_TRACING_INTENT_HANDLER_H_
#define CONTENT_BROWSER_ANDROID_TRACING_INTENT_HANDLER_H_
#include <jni.h>
#include <string>
#include "base/file_util.h"
#include "content/browser/tracing/trace_subscriber_stdio.h"
namespace content {
@ -29,4 +28,4 @@ class TracingIntentHandler : public TraceSubscriberStdio {
};
} // namespace content
#endif // CONTENT_BROWSER_ANDROID_TRACING_INTENT_HANDLER_H
#endif // CONTENT_BROWSER_ANDROID_TRACING_INTENT_HANDLER_H_

@ -4,7 +4,6 @@
#include "content/browser/appcache/chrome_appcache_service.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"

@ -6,7 +6,6 @@
#include <string>
#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@ -64,7 +63,7 @@ MATCHER_P2(DownloadCreateInfoWithDefaultPath, info, download_directory, "") {
class MockDownloadItemImpl : public DownloadItemImpl {
public:
// Use history constructor for minimal base object.
MockDownloadItemImpl(DownloadItemImplDelegate* delegate)
explicit MockDownloadItemImpl(DownloadItemImplDelegate* delegate)
: DownloadItemImpl(
delegate,
content::DownloadId(),
@ -426,7 +425,7 @@ class MockDownloadManagerObserver : public DownloadManager::Observer {
DownloadManager*, int32));
};
} // namespace
} // namespace
class DownloadManagerTest : public testing::Test {
public:

@ -5,7 +5,6 @@
#include "content/browser/download/drag_download_file.h"
#include "base/bind.h"
#include "base/file_util.h"
#include "base/message_loop.h"
#include "content/browser/download/download_stats.h"
#include "content/browser/web_contents/web_contents_impl.h"
@ -68,7 +67,7 @@ class DragDownloadFile::DragDownloadFileUI : public DownloadItem::Observer {
params->set_callback(base::Bind(&DragDownloadFileUI::OnDownloadStarted,
weak_ptr_factory_.GetWeakPtr()));
params->set_file_path(file_path);
params->set_file_stream(file_stream.Pass()); // Nulls file_stream.
params->set_file_stream(file_stream.Pass()); // Nulls file_stream.
download_manager->DownloadUrl(params.Pass());
}

@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "content/browser/download/download_file_factory.h"

@ -4,7 +4,6 @@
#include "content/browser/download/save_item.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "content/browser/download/save_file.h"
@ -122,12 +121,12 @@ void SaveItem::Rename(const base::FilePath& full_path) {
}
void SaveItem::SetSaveId(int32 save_id) {
DCHECK(save_id_ == -1);
DCHECK_EQ(-1, save_id_);
save_id_ = save_id;
}
void SaveItem::SetTotalBytes(int64 total_bytes) {
DCHECK(total_bytes_ == 0);
DCHECK_EQ(0, total_bytes_);
total_bytes_ = total_bytes;
}

@ -12,7 +12,6 @@
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/debug/trace_event.h"
#include "base/file_util.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/stringprintf.h"

@ -6,7 +6,6 @@
#include <vector>
#include "base/file_util.h"
#include "base/logging.h"
#include "base/message_loop_proxy.h"
#include "content/browser/indexed_db/indexed_db_context_impl.h"

@ -5,7 +5,6 @@
#include "content/browser/loader/redirect_to_file_resource_handler.h"
#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_util_proxy.h"
#include "base/logging.h"
#include "base/message_loop_proxy.h"

@ -15,7 +15,6 @@
#include "base/base_switches.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"

@ -8,7 +8,6 @@
#include "base/bind_helpers.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"

@ -10,7 +10,6 @@
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/debug/alias.h"
#include "base/file_util.h"
#include "base/process_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/threading/thread.h"
@ -734,7 +733,7 @@ void RenderMessageFilter::OnDidCreateOutOfProcessPepperInstance(
// mapping to decide how to handle messages received from the (untrusted)
// plugin, so an exploited renderer must not be able to insert fake mappings
// that may allow it access to other render processes.
DCHECK(instance_data.render_process_id == 0);
DCHECK_EQ(0, instance_data.render_process_id);
instance_data.render_process_id = render_process_id_;
if (is_external) {
// We provide the BrowserPpapiHost to the embedder, so it's safe to cast.

@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/file_util.h"
#include "base/json/json_reader.h"
#include "base/memory/ref_counted.h"
#include "base/path_service.h"
@ -1050,6 +1049,7 @@ class RenderViewHostObserverArray {
size_t GetNumObservers() const {
return observers_.size();
}
private:
friend class RVHObserver;
class RVHObserver : public RenderViewHostObserver {

@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/debug/trace_event.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/threading/sequenced_worker_pool.h"
#include "content/public/browser/browser_thread.h"

@ -8,10 +8,13 @@
#include <string>
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "content/public/browser/trace_subscriber.h"
#include "content/common/content_export.h"
namespace base {
class FilePath;
}
namespace content {
class TraceSubscriberStdioImpl;

@ -4,6 +4,7 @@
#include "content/browser/tracing/trace_subscriber_stdio.h"
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/threading/sequenced_worker_pool.h"
#include "content/public/browser/browser_thread.h"

@ -5,7 +5,6 @@
#include "content/browser/web_contents/navigation_controller_impl.h"
#include "base/bind.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/string_number_conversions.h" // Temporary
#include "base/string_util.h"
@ -145,7 +144,7 @@ const size_t kMaxEntryCountForTestingNotSet = -1;
size_t NavigationControllerImpl::max_entry_count_for_testing_ =
kMaxEntryCountForTestingNotSet;
// Should Reload check for post data? The default is true, but is set to false
// Should Reload check for post data? The default is true, but is set to false
// when testing.
static bool g_check_for_repost = true;
@ -948,7 +947,7 @@ bool NavigationControllerImpl::IsRedirect(
}
void NavigationControllerImpl::RendererDidNavigateToNewPage(
const ViewHostMsg_FrameNavigate_Params& params, bool replace_entry) {
const ViewHostMsg_FrameNavigate_Params& params, bool replace_entry) {
NavigationEntryImpl* new_entry;
bool update_virtual_url;
// Only make a copy of the pending entry if it is appropriate for the new page
@ -1310,7 +1309,7 @@ void NavigationControllerImpl::PruneAllButActiveInternal() {
if (!GetEntryCount())
return;
DCHECK(last_committed_entry_index_ >= 0);
DCHECK_GE(last_committed_entry_index_, 0);
entries_.erase(entries_.begin(),
entries_.begin() + last_committed_entry_index_);
entries_.erase(entries_.begin() + 1, entries_.end());
@ -1488,7 +1487,7 @@ void NavigationControllerImpl::InsertOrReplaceEntry(NavigationEntryImpl* entry,
void NavigationControllerImpl::PruneOldestEntryIfFull() {
if (entries_.size() >= max_entry_count()) {
DCHECK_EQ(max_entry_count(), entries_.size());
DCHECK(last_committed_entry_index_ > 0);
DCHECK_GT(last_committed_entry_index_, 0);
RemoveEntryAtIndex(0);
NotifyPrunedEntries(this, true, 1);
}

@ -6,7 +6,6 @@
#include <string>
#include "base/file_util.h"
#include "base/nix/mime_util_xdg.h"
#include "base/threading/thread_restrictions.h"
#include "base/utf_string_conversions.h"

@ -11,7 +11,6 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/debug/trace_event.h"
#include "base/file_util.h"
#include "base/lazy_instance.h"
#include "base/memory/ref_counted.h"
#include "base/memory/ref_counted_memory.h"

@ -4,7 +4,6 @@
#include "content/common/fileapi/file_system_dispatcher.h"
#include "base/file_util.h"
#include "base/process.h"
#include "content/common/child_thread.h"
#include "content/common/fileapi/file_system_messages.h"

@ -5,7 +5,6 @@
#include "content/common/pepper_plugin_registry.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/native_library.h"
#include "base/string_util.h"
#include "base/strings/string_split.h"

@ -13,7 +13,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/posix/eintr_wrapper.h"
@ -95,7 +94,7 @@ void LinuxSandbox::PreinitializeSandbox() {
// Open proc_fd_ only in Debug mode so that forgetting to close it doesn't
// produce a sandbox escape in Release mode.
proc_fd_ = open("/proc", O_DIRECTORY | O_RDONLY);
CHECK(proc_fd_ >= 0);
CHECK_GE(proc_fd_, 0);
#endif // !defined(NDEBUG)
// We "pre-warm" the code that detects supports for seccomp BPF.
if (SandboxSeccompBpf::IsSeccompBpfDesired()) {

@ -4,7 +4,6 @@
#include "content/renderer/browser_plugin/browser_plugin_browsertest.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/memory/singleton.h"
#include "base/path_service.h"

@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "content/test/image_decoder_test.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebImageDecoder.h"

@ -5,7 +5,6 @@
#include "content/renderer/renderer_webkitplatformsupport_impl.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
#include "base/metrics/histogram.h"

@ -6,6 +6,7 @@
// inside an android application.
#include <android/log.h>
#include <unistd.h>
#include "base/android/base_jni_registrar.h"
#include "base/android/jni_android.h"
@ -13,7 +14,6 @@
#include "base/android/scoped_java_ref.h"
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/string_util.h"
@ -53,7 +53,6 @@ static void RunTests(JNIEnv* env,
jobject obj,
jstring jfiles_dir,
jobject app_context) {
// Command line basic initialization, will be fully initialized later.
static const char* const kInitialArgv[] = { "ContentBrowserTestsActivity" };
CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);