Moving file_metadata files under content/browser/download

content/browser/download/base_file.cc

 // Copyright (c) 2012 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/download/base_file.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/download/download_net_log_parameters.h"
 #include "content/browser/download/download_stats.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "crypto/secure_hash.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 
 #include "content/browser/safe_util_win.h"
 #elif defined(OS_MACOSX)
-#include "content/browser/file_metadata_mac.h"
+#include "content/browser/download/file_metadata_mac.h"
 #elif defined(OS_LINUX)
 #include "content/browser/download/file_metadata_linux.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 #define LOG_ERROR(o, e)  \
   LogError(__FILE__, __LINE__, __FUNCTION__, bound_net_log_, o, e)
@@ skipping 421 matching lines @@
 void BaseFile::AnnotateWithSourceInformation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!detached_);
 
 #if defined(OS_WIN)
   // Sets the Zone to tell Windows that this file comes from the internet.
   // We ignore the return value because a failure is not fatal.
   win_util::SetInternetZoneIdentifier(full_path_,
                                       UTF8ToWide(source_url_.spec()));
 #elif defined(OS_MACOSX)
-  file_metadata::AddQuarantineMetadataToFile(full_path_, source_url_,
-                                             referrer_url_);
-  file_metadata::AddOriginMetadataToFile(full_path_, source_url_,
-                                         referrer_url_);
+  content::AddQuarantineMetadataToFile(full_path_, source_url_, referrer_url_);
+  content::AddOriginMetadataToFile(full_path_, source_url_, referrer_url_);
 #elif defined(OS_LINUX)
   content::AddOriginMetadataToFile(full_path_, source_url_, referrer_url_);
 #endif
 }
 
 void BaseFile::CreateFileStream() {
   file_stream_.reset(new net::FileStream(bound_net_log_.net_log()));
   file_stream_->SetBoundNetLogSource(bound_net_log_);
 }
 
@@ skipping 68 matching lines @@
   base::TimeDelta diff = current_time - start_tick_;
   int64 diff_ms = diff.InMilliseconds();
   return diff_ms == 0 ? 0 : bytes_so_far() * 1000 / diff_ms;
 }
 
 int64 BaseFile::CurrentSpeed() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return CurrentSpeedAtTime(base::TimeTicks::Now());
 }