summaryrefslogtreecommitdiff
path: root/content/browser/download/base_file_win.cc
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-06-11 10:57:03 +0100
committerTorne (Richard Coles) <torne@google.com>2013-06-11 10:57:03 +0100
commit868fa2fe829687343ffae624259930155e16dbd8 (patch)
tree54d316199dd9739c57c3aacd131853bbd6554a94 /content/browser/download/base_file_win.cc
parentbb1bdbd796f966b5bf11f40ecbea12621c7bfac9 (diff)
downloadchromium_org-868fa2fe829687343ffae624259930155e16dbd8.tar.gz
Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py. Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
Diffstat (limited to 'content/browser/download/base_file_win.cc')
-rw-r--r--content/browser/download/base_file_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/download/base_file_win.cc b/content/browser/download/base_file_win.cc
index 3f0d9d3e63..449134efb1 100644
--- a/content/browser/download/base_file_win.cc
+++ b/content/browser/download/base_file_win.cc
@@ -9,8 +9,8 @@
#include "base/file_util.h"
#include "base/metrics/histogram.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
#include "content/browser/download/download_interrupt_reasons_impl.h"
#include "content/browser/download/download_stats.h"
#include "content/browser/safe_util_win.h"