Moving all the incident reporting stuff to a common folder

BUG=

Review URL: https://codereview.chromium.org/470213002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289938 0039d316-1c4b-4281-b951-d872f2087c98

46 files changed, 141 insertions, 139 deletions

diff --git a/chrome/browser/safe_browsing/incident_reporting/OWNERS b/chrome/browser/safe_browsing/incident_reporting/OWNERS
new file mode 100644
index 0000000..68b1eef
--- /dev/null
+++ b/chrome/browser/safe_browsing/incident_reporting/OWNERS
@@ -0,0 +1,2 @@
+grt@chromium.org
+robertshield@chromium.org
diff --git a/chrome/browser/safe_browsing/add_incident_callback.h b/chrome/browser/safe_browsing/incident_reporting/add_incident_callback.h
index 7b866c3..6c0602b 100644
--- a/chrome/browser/safe_browsing/add_incident_callback.h
+++ b/chrome/browser/safe_browsing/incident_reporting/add_incident_callback.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_ADD_INCIDENT_CALLBACK_H_
-#define CHROME_BROWSER_SAFE_BROWSING_ADD_INCIDENT_CALLBACK_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ADD_INCIDENT_CALLBACK_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ADD_INCIDENT_CALLBACK_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
@@ -19,4 +19,4 @@ typedef base::Callback<void(scoped_ptr<ClientIncidentReport_IncidentData>)>
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_ADD_INCIDENT_CALLBACK_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ADD_INCIDENT_CALLBACK_H_
diff --git a/chrome/browser/safe_browsing/binary_integrity_analyzer.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc
index f22141f..cacbbbb 100644
--- a/chrome/browser/safe_browsing/binary_integrity_analyzer.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/binary_integrity_analyzer.h"
+#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h"
 
 #include <string>
 
diff --git a/chrome/browser/safe_browsing/binary_integrity_analyzer.h b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h
index 9627cb7..1b37533 100644
--- a/chrome/browser/safe_browsing/binary_integrity_analyzer.h
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_BINARY_INTEGRITY_ANALYZER_H_
-#define CHROME_BROWSER_SAFE_BROWSING_BINARY_INTEGRITY_ANALYZER_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_ANALYZER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_ANALYZER_H_
 
 #include <vector>
 
-#include "chrome/browser/safe_browsing/add_incident_callback.h"
+#include "chrome/browser/safe_browsing/incident_reporting/add_incident_callback.h"
 
 namespace base {
 class FilePath;
@@ -29,4 +29,4 @@ std::vector<base::FilePath> GetCriticalBinariesPath();
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_BINARY_INTEGRITY_ANALYZER_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_ANALYZER_H_
diff --git a/chrome/browser/safe_browsing/binary_integrity_analyzer_win.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
index 0c5f077..1a61a47 100644
--- a/chrome/browser/safe_browsing/binary_integrity_analyzer_win.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/binary_integrity_analyzer.h"
+#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
diff --git a/chrome/browser/safe_browsing/binary_integrity_analyzer_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
index 7042b41..76a050e 100644
--- a/chrome/browser/safe_browsing/binary_integrity_analyzer_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/binary_integrity_analyzer.h"
+#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/safe_browsing/binary_integrity_incident_handlers.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.cc
index a7f9668..0ad0c85 100644
--- a/chrome/browser/safe_browsing/binary_integrity_incident_handlers.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/binary_integrity_incident_handlers.h"
+#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.h"
 
 #include "base/logging.h"
-#include "chrome/browser/safe_browsing/incident_handler_util.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_handler_util.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 
 namespace safe_browsing {
diff --git a/chrome/browser/safe_browsing/binary_integrity_incident_handlers.h b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.h
index b615829..cc6ea60 100644
--- a/chrome/browser/safe_browsing/binary_integrity_incident_handlers.h
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_BINARY_INTEGRITY_INCIDENT_HANDLERS_H_
-#define CHROME_BROWSER_SAFE_BROWSING_BINARY_INTEGRITY_INCIDENT_HANDLERS_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_INCIDENT_HANDLERS_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_INCIDENT_HANDLERS_H_
 
 #include <stdint.h>
 
@@ -23,4 +23,4 @@ uint32_t GetBinaryIntegrityIncidentDigest(
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_BINARY_INTEGRITY_INCIDENT_HANDLERS_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_INCIDENT_HANDLERS_H_
diff --git a/chrome/browser/safe_browsing/binary_integrity_incident_handlers_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers_unittest.cc
index 91b4559..3f6bc55 100644
--- a/chrome/browser/safe_browsing/binary_integrity_incident_handlers_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/binary_integrity_incident_handlers.h"
+#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
diff --git a/chrome/browser/safe_browsing/delayed_analysis_callback.h b/chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h
index e36282f..a5bf108 100644
--- a/chrome/browser/safe_browsing/delayed_analysis_callback.h
+++ b/chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_DELAYED_ANALYSIS_CALLBACK_H_
-#define CHROME_BROWSER_SAFE_BROWSING_DELAYED_ANALYSIS_CALLBACK_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_DELAYED_ANALYSIS_CALLBACK_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_DELAYED_ANALYSIS_CALLBACK_H_
 
 #include "base/callback_forward.h"
-#include "chrome/browser/safe_browsing/add_incident_callback.h"
+#include "chrome/browser/safe_browsing/incident_reporting/add_incident_callback.h"
 
 namespace safe_browsing {
 
@@ -19,4 +19,4 @@ typedef base::Callback<void(const AddIncidentCallback&)>
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_DELAYED_ANALYSIS_CALLBACK_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_DELAYED_ANALYSIS_CALLBACK_H_
diff --git a/chrome/browser/safe_browsing/delayed_callback_runner.cc b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.cc
index f344459..142da45 100644
--- a/chrome/browser/safe_browsing/delayed_callback_runner.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/delayed_callback_runner.h"
+#include "chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h"
 
 #include "base/location.h"
 
diff --git a/chrome/browser/safe_browsing/delayed_callback_runner.h b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h
index ff37837..3bea1a4 100644
--- a/chrome/browser/safe_browsing/delayed_callback_runner.h
+++ b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_DELAYED_CALLBACK_RUNNER_H_
-#define CHROME_BROWSER_SAFE_BROWSING_DELAYED_CALLBACK_RUNNER_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_DELAYED_CALLBACK_RUNNER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_DELAYED_CALLBACK_RUNNER_H_
 
 #include <list>
 
@@ -63,4 +63,4 @@ class DelayedCallbackRunner {
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_DELAYED_CALLBACK_RUNNER_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_DELAYED_CALLBACK_RUNNER_H_
diff --git a/chrome/browser/safe_browsing/delayed_callback_runner_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc
index c1b4a79..04d8ea34 100644
--- a/chrome/browser/safe_browsing/delayed_callback_runner_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/delayed_callback_runner.h"
+#include "chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h"
 
 #include <map>
 #include <string>
diff --git a/chrome/browser/safe_browsing/environment_data_collection.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc
index 0f9ed32..7760834 100644
--- a/chrome/browser/safe_browsing/environment_data_collection.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/environment_data_collection.h"
+#include "chrome/browser/safe_browsing/incident_reporting/environment_data_collection.h"
 
 #include <string>
 
diff --git a/chrome/browser/safe_browsing/environment_data_collection.h b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.h
index d02ae63..e8dfb8f 100644
--- a/chrome/browser/safe_browsing/environment_data_collection.h
+++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_H_
-#define CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ENVIRONMENT_DATA_COLLECTION_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ENVIRONMENT_DATA_COLLECTION_H_
 
 namespace safe_browsing {
 
@@ -15,4 +15,4 @@ void CollectEnvironmentData(ClientIncidentReport_EnvironmentData* data);
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ENVIRONMENT_DATA_COLLECTION_H_
diff --git a/chrome/browser/safe_browsing/environment_data_collection_win.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc
index 1933e7f..aa0deb7 100644
--- a/chrome/browser/safe_browsing/environment_data_collection_win.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/environment_data_collection_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h"
 
 #include <windows.h>
 #include <set>
@@ -14,7 +14,7 @@
 #include "chrome/browser/install_verification/win/module_info.h"
 #include "chrome/browser/install_verification/win/module_verification_common.h"
 #include "chrome/browser/net/service_providers_win.h"
-#include "chrome/browser/safe_browsing/module_integrity_verifier_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h"
 #include "chrome/browser/safe_browsing/path_sanitizer.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome_elf/chrome_elf_constants.h"
diff --git a/chrome/browser/safe_browsing/environment_data_collection_win.h b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h
index 53d5ca3..687eb8a 100644
--- a/chrome/browser/safe_browsing/environment_data_collection_win.h
+++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
-#define CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
 
 namespace safe_browsing {
 
@@ -32,4 +32,4 @@ void CollectDllBlacklistData(
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
diff --git a/chrome/browser/safe_browsing/environment_data_collection_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc
index b1ee0b3..e8af00d 100644
--- a/chrome/browser/safe_browsing/environment_data_collection_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/environment_data_collection_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h"
 
 #include <string>
 
@@ -13,8 +13,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/win/registry.h"
-#include "chrome/browser/safe_browsing/module_integrity_unittest_util_win.h"
-#include "chrome/browser/safe_browsing/module_integrity_verifier_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h"
 #include "chrome/browser/safe_browsing/path_sanitizer.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome_elf/chrome_elf_constants.h"
diff --git a/chrome/browser/safe_browsing/incident_handler_util.cc b/chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
index e0ef458..fe5605e 100644
--- a/chrome/browser/safe_browsing/incident_handler_util.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/incident_handler_util.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_handler_util.h"
 
 #include <string>
 
diff --git a/chrome/browser/safe_browsing/incident_handler_util.h b/chrome/browser/safe_browsing/incident_reporting/incident_handler_util.h
index a8a84ad..01826e4 100644
--- a/chrome/browser/safe_browsing/incident_handler_util.h
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_handler_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_HANDLER_UTIL_H_
-#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_HANDLER_UTIL_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_HANDLER_UTIL_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_HANDLER_UTIL_H_
 
 #include <stdint.h>
 
@@ -24,4 +24,4 @@ uint32_t HashMessage(const google::protobuf::MessageLite& message);
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_HANDLER_UTIL_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_HANDLER_UTIL_H_
diff --git a/chrome/browser/safe_browsing/incident_report_uploader.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.cc
index ba80032..94d704a 100644
--- a/chrome/browser/safe_browsing/incident_report_uploader.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/incident_report_uploader.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h"
 
 namespace safe_browsing {
 
diff --git a/chrome/browser/safe_browsing/incident_report_uploader.h b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h
index d564848..46de6fe 100644
--- a/chrome/browser/safe_browsing/incident_report_uploader.h
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORT_UPLOADER_H_
-#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORT_UPLOADER_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORT_UPLOADER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORT_UPLOADER_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ -45,4 +45,4 @@ class IncidentReportUploader {
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORT_UPLOADER_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORT_UPLOADER_H_
diff --git a/chrome/browser/safe_browsing/incident_report_uploader_impl.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
index 287356d..b5e7684 100644
--- a/chrome/browser/safe_browsing/incident_report_uploader_impl.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/incident_report_uploader_impl.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
diff --git a/chrome/browser/safe_browsing/incident_report_uploader_impl.h b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h
index 0eb4ca6..9672c5a 100644
--- a/chrome/browser/safe_browsing/incident_report_uploader_impl.h
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORT_UPLOADER_IMPL_H_
-#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORT_UPLOADER_IMPL_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORT_UPLOADER_IMPL_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORT_UPLOADER_IMPL_H_
 
 #include <string>
 
@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "chrome/browser/safe_browsing/incident_report_uploader.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
@@ -68,4 +68,4 @@ class IncidentReportUploaderImpl : public IncidentReportUploader,
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORT_UPLOADER_IMPL_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORT_UPLOADER_IMPL_H_
diff --git a/chrome/browser/safe_browsing/incident_report_uploader_impl_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc
index e9b89b4..f2d338c 100644
--- a/chrome/browser/safe_browsing/incident_report_uploader_impl_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/incident_report_uploader_impl.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h"
 
 #include <string>
 
diff --git a/chrome/browser/safe_browsing/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
index fe13fec..951144a 100644
--- a/chrome/browser/safe_browsing/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/incident_reporting_service.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h"
 
 #include <math.h>
 
@@ -23,13 +23,13 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/tracked/tracked_preference_validation_delegate.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/binary_integrity_incident_handlers.h"
 #include "chrome/browser/safe_browsing/database_manager.h"
-#include "chrome/browser/safe_browsing/environment_data_collection.h"
-#include "chrome/browser/safe_browsing/incident_report_uploader_impl.h"
-#include "chrome/browser/safe_browsing/preference_validation_delegate.h"
+#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.h"
+#include "chrome/browser/safe_browsing/incident_reporting/environment_data_collection.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h"
+#include "chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h"
+#include "chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/safe_browsing/tracked_preference_incident_handlers.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting_service.h b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
index 196885f..1b9f3d3 100644
--- a/chrome/browser/safe_browsing/incident_reporting_service.h
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_SERVICE_H_
-#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_SERVICE_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORTING_SERVICE_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORTING_SERVICE_H_
 
 #include <stdint.h>
 
@@ -18,11 +18,11 @@
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/safe_browsing/add_incident_callback.h"
-#include "chrome/browser/safe_browsing/delayed_analysis_callback.h"
-#include "chrome/browser/safe_browsing/delayed_callback_runner.h"
-#include "chrome/browser/safe_browsing/incident_report_uploader.h"
-#include "chrome/browser/safe_browsing/last_download_finder.h"
+#include "chrome/browser/safe_browsing/incident_reporting/add_incident_callback.h"
+#include "chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h"
+#include "chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h"
+#include "chrome/browser/safe_browsing/incident_reporting/last_download_finder.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -313,4 +313,4 @@ class IncidentReportingService : public content::NotificationObserver {
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_SERVICE_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORTING_SERVICE_H_
diff --git a/chrome/browser/safe_browsing/incident_reporting_service_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
index 903002a..e676110 100644
--- a/chrome/browser/safe_browsing/incident_reporting_service_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/incident_reporting_service.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h"
 
 #include <map>
 #include <string>
@@ -15,8 +15,8 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_local.h"
 #include "chrome/browser/prefs/browser_prefs.h"
-#include "chrome/browser/safe_browsing/incident_report_uploader.h"
-#include "chrome/browser/safe_browsing/last_download_finder.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h"
+#include "chrome/browser/safe_browsing/incident_reporting/last_download_finder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/safe_browsing/last_download_finder.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc
index d0e1c2f1..b829960 100644
--- a/chrome/browser/safe_browsing/last_download_finder.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/last_download_finder.h"
+#include "chrome/browser/safe_browsing/incident_reporting/last_download_finder.h"
 
 #include <algorithm>
 #include <functional>
diff --git a/chrome/browser/safe_browsing/last_download_finder.h b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h
index 4fef70c..a792f98 100644
--- a/chrome/browser/safe_browsing/last_download_finder.h
+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_LAST_DOWNLOAD_FINDER_H_
-#define CHROME_BROWSER_SAFE_BROWSING_LAST_DOWNLOAD_FINDER_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_LAST_DOWNLOAD_FINDER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_LAST_DOWNLOAD_FINDER_H_
 
 #include <vector>
 
@@ -114,4 +114,4 @@ class LastDownloadFinder : public content::NotificationObserver {
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_LAST_DOWNLOAD_FINDER_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_LAST_DOWNLOAD_FINDER_H_
diff --git a/chrome/browser/safe_browsing/last_download_finder_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
index eedacb6..ab2c0c7 100644
--- a/chrome/browser/safe_browsing/last_download_finder_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/last_download_finder.h"
+#include "chrome/browser/safe_browsing/incident_reporting/last_download_finder.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/safe_browsing/module_integrity_unittest_util_win.cc b/chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.cc
index 9be57d3..1293bd4 100644
--- a/chrome/browser/safe_browsing/module_integrity_unittest_util_win.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/module_integrity_unittest_util_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h"
 
 #include "base/macros.h"
 
diff --git a/chrome/browser/safe_browsing/module_integrity_unittest_util_win.h b/chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h
index 29e8f18..262e015 100644
--- a/chrome/browser/safe_browsing/module_integrity_unittest_util_win.h
+++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_MODULE_INTEGRITY_UNITTEST_UTIL_WIN_H_
-#define CHROME_BROWSER_SAFE_BROWSING_MODULE_INTEGRITY_UNITTEST_UTIL_WIN_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_MODULE_INTEGRITY_UNITTEST_UTIL_WIN_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_MODULE_INTEGRITY_UNITTEST_UTIL_WIN_H_
 
 namespace safe_browsing {
 
@@ -20,4 +20,4 @@ extern const char kTestExportName[];
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_MODULE_INTEGRITY_UNITTEST_UTIL_WIN_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_MODULE_INTEGRITY_UNITTEST_UTIL_WIN_H_
diff --git a/chrome/browser/safe_browsing/module_integrity_verifier_win.cc b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc
index 8478116..a4c48eb 100644
--- a/chrome/browser/safe_browsing/module_integrity_verifier_win.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/module_integrity_verifier_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h"
 
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/safe_browsing/module_integrity_verifier_win.h b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h
index b3b19f8..a09c0cd 100644
--- a/chrome/browser/safe_browsing/module_integrity_verifier_win.h
+++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_MODULE_INTEGRITY_VERIFIER_WIN_H_
-#define CHROME_BROWSER_SAFE_BROWSING_MODULE_INTEGRITY_VERIFIER_WIN_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_MODULE_INTEGRITY_VERIFIER_WIN_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_MODULE_INTEGRITY_VERIFIER_WIN_H_
 
 #include <stdint.h>
 
@@ -43,4 +43,4 @@ ModuleState VerifyModule(const wchar_t* module_name,
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_MODULE_INTEGRITY_VERIFIER_WIN_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_MODULE_INTEGRITY_VERIFIER_WIN_H_
diff --git a/chrome/browser/safe_browsing/module_integrity_verifier_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
index 36c721e..05f89ad 100644
--- a/chrome/browser/safe_browsing/module_integrity_verifier_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/module_integrity_verifier_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h"
 
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
@@ -10,7 +10,7 @@
 #include "base/path_service.h"
 #include "base/scoped_native_library.h"
 #include "base/win/pe_image.h"
-#include "chrome/browser/safe_browsing/module_integrity_unittest_util_win.h"
+#include "chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace safe_browsing {
diff --git a/chrome/browser/safe_browsing/preference_validation_delegate.cc b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.cc
index 55ad2a5..236c637 100644
--- a/chrome/browser/safe_browsing/preference_validation_delegate.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/preference_validation_delegate.h"
+#include "chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/safe_browsing/preference_validation_delegate.h b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h
index d898af11..09abe4f 100644
--- a/chrome/browser/safe_browsing/preference_validation_delegate.h
+++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_PREFERENCE_VALIDATION_DELEGATE_H_
-#define CHROME_BROWSER_SAFE_BROWSING_PREFERENCE_VALIDATION_DELEGATE_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_PREFERENCE_VALIDATION_DELEGATE_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_PREFERENCE_VALIDATION_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/prefs/tracked/tracked_preference_validation_delegate.h"
-#include "chrome/browser/safe_browsing/add_incident_callback.h"
+#include "chrome/browser/safe_browsing/incident_reporting/add_incident_callback.h"
 
 namespace safe_browsing {
 
@@ -42,4 +42,4 @@ class PreferenceValidationDelegate
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_PREFERENCE_VALIDATION_DELEGATE_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_PREFERENCE_VALIDATION_DELEGATE_H_
diff --git a/chrome/browser/safe_browsing/preference_validation_delegate_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
index 14de539..d35e656 100644
--- a/chrome/browser/safe_browsing/preference_validation_delegate_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/preference_validation_delegate.h"
+#include "chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/safe_browsing/tracked_preference_incident_handlers.cc b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.cc
index ed3d2e1..16bc823 100644
--- a/chrome/browser/safe_browsing/tracked_preference_incident_handlers.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/tracked_preference_incident_handlers.h"
+#include "chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.h"
 
 #include "base/logging.h"
-#include "chrome/browser/safe_browsing/incident_handler_util.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_handler_util.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 
 namespace safe_browsing {
diff --git a/chrome/browser/safe_browsing/tracked_preference_incident_handlers.h b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.h
index ca2e5f3..263f964 100644
--- a/chrome/browser/safe_browsing/tracked_preference_incident_handlers.h
+++ b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAFE_BROWSING_TRACKED_PREFERENCE_INCIDENT_HANDLERS_H_
-#define CHROME_BROWSER_SAFE_BROWSING_TRACKED_PREFERENCE_INCIDENT_HANDLERS_H_
+#ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_TRACKED_PREFERENCE_INCIDENT_HANDLERS_H_
+#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_TRACKED_PREFERENCE_INCIDENT_HANDLERS_H_
 
 #include <stdint.h>
 
@@ -23,4 +23,4 @@ uint32_t GetTrackedPreferenceIncidentDigest(
 
 }  // namespace safe_browsing
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_TRACKED_PREFERENCE_INCIDENT_HANDLERS_H_
+#endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_TRACKED_PREFERENCE_INCIDENT_HANDLERS_H_
diff --git a/chrome/browser/safe_browsing/tracked_preference_incident_handlers_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers_unittest.cc
index e6d4d43..0e259cc 100644
--- a/chrome/browser/safe_browsing/tracked_preference_incident_handlers_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/safe_browsing/tracked_preference_incident_handlers.h"
+#include "chrome/browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 9ecda09..72fa156 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -24,11 +24,11 @@
 #include "chrome/browser/prefs/tracked/tracked_preference_validation_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/safe_browsing/binary_integrity_analyzer.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/database_manager.h"
 #include "chrome/browser/safe_browsing/download_protection_service.h"
-#include "chrome/browser/safe_browsing/incident_reporting_service.h"
+#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h"
 #include "chrome/browser/safe_browsing/malware_details.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index 4795d7f..c034b06 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -17,7 +17,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "chrome/browser/safe_browsing/delayed_analysis_callback.h"
+#include "chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8c3ee60..c788c99 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2637,15 +2637,9 @@
       'browser/download/download_completion_blocker.h',
       'browser/renderer_host/safe_browsing_resource_throttle.cc',
       'browser/renderer_host/safe_browsing_resource_throttle.h',
-      'browser/safe_browsing/add_incident_callback.h',
       'browser/safe_browsing/binary_feature_extractor.h',
       'browser/safe_browsing/binary_feature_extractor_posix.cc',
       'browser/safe_browsing/binary_feature_extractor_win.cc',
-      'browser/safe_browsing/binary_integrity_analyzer.cc',
-      'browser/safe_browsing/binary_integrity_analyzer.h',
-      'browser/safe_browsing/binary_integrity_analyzer_win.cc',
-      'browser/safe_browsing/binary_integrity_incident_handlers.cc',
-      'browser/safe_browsing/binary_integrity_incident_handlers.h',
       'browser/safe_browsing/browser_feature_extractor.cc',
       'browser/safe_browsing/browser_feature_extractor.h',
       'browser/safe_browsing/browser_features.cc',
@@ -2658,37 +2652,45 @@
       'browser/safe_browsing/client_side_detection_service.h',
       'browser/safe_browsing/database_manager.cc',
       'browser/safe_browsing/database_manager.h',
-      'browser/safe_browsing/delayed_analysis_callback.h',
-      'browser/safe_browsing/delayed_callback_runner.cc',
-      'browser/safe_browsing/delayed_callback_runner.h',
       'browser/safe_browsing/download_feedback.cc',
       'browser/safe_browsing/download_feedback.h',
       'browser/safe_browsing/download_feedback_service.cc',
       'browser/safe_browsing/download_feedback_service.h',
       'browser/safe_browsing/download_protection_service.cc',
       'browser/safe_browsing/download_protection_service.h',
-      'browser/safe_browsing/environment_data_collection.cc',
-      'browser/safe_browsing/environment_data_collection.h',
-      'browser/safe_browsing/environment_data_collection_win.cc',
-      'browser/safe_browsing/environment_data_collection_win.h',
-      'browser/safe_browsing/incident_handler_util.cc',
-      'browser/safe_browsing/incident_handler_util.h',
-      'browser/safe_browsing/incident_reporting_service.cc',
-      'browser/safe_browsing/incident_reporting_service.h',
-      'browser/safe_browsing/incident_report_uploader.cc',
-      'browser/safe_browsing/incident_report_uploader.h',
-      'browser/safe_browsing/incident_report_uploader_impl.cc',
-      'browser/safe_browsing/incident_report_uploader_impl.h',
-      'browser/safe_browsing/last_download_finder.cc',
-      'browser/safe_browsing/last_download_finder.h',
-      'browser/safe_browsing/module_integrity_verifier_win.cc',
-      'browser/safe_browsing/module_integrity_verifier_win.h',
+      'browser/safe_browsing/incident_reporting/add_incident_callback.h',
+      'browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc',
+      'browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h',
+      'browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc',
+      'browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.cc',
+      'browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.h',
+      'browser/safe_browsing/incident_reporting/delayed_analysis_callback.h',
+      'browser/safe_browsing/incident_reporting/delayed_callback_runner.cc',
+      'browser/safe_browsing/incident_reporting/delayed_callback_runner.h',
+      'browser/safe_browsing/incident_reporting/environment_data_collection.cc',
+      'browser/safe_browsing/incident_reporting/environment_data_collection.h',
+      'browser/safe_browsing/incident_reporting/environment_data_collection_win.cc',
+      'browser/safe_browsing/incident_reporting/environment_data_collection_win.h',
+      'browser/safe_browsing/incident_reporting/incident_handler_util.cc',
+      'browser/safe_browsing/incident_reporting/incident_handler_util.h',
+      'browser/safe_browsing/incident_reporting/incident_reporting_service.cc',
+      'browser/safe_browsing/incident_reporting/incident_reporting_service.h',
+      'browser/safe_browsing/incident_reporting/incident_report_uploader.cc',
+      'browser/safe_browsing/incident_reporting/incident_report_uploader.h',
+      'browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc',
+      'browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h',
+      'browser/safe_browsing/incident_reporting/last_download_finder.cc',
+      'browser/safe_browsing/incident_reporting/last_download_finder.h',
+      'browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc',
+      'browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h',
+      'browser/safe_browsing/incident_reporting/preference_validation_delegate.cc',
+      'browser/safe_browsing/incident_reporting/preference_validation_delegate.h',
+      'browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.cc',
+      'browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.h',
       'browser/safe_browsing/path_sanitizer.cc',
       'browser/safe_browsing/path_sanitizer.h',
       'browser/safe_browsing/pe_image_reader_win.cc',
       'browser/safe_browsing/pe_image_reader_win.h',
-      'browser/safe_browsing/preference_validation_delegate.cc',
-      'browser/safe_browsing/preference_validation_delegate.h',
       'browser/safe_browsing/prefix_set.cc',
       'browser/safe_browsing/prefix_set.h',
       'browser/safe_browsing/protocol_manager.cc',
@@ -2703,8 +2705,6 @@
       'browser/safe_browsing/safe_browsing_store.h',
       'browser/safe_browsing/sandboxed_zip_analyzer.cc',
       'browser/safe_browsing/sandboxed_zip_analyzer.h',
-      'browser/safe_browsing/tracked_preference_incident_handlers.cc',
-      'browser/safe_browsing/tracked_preference_incident_handlers.h',
       'browser/safe_browsing/two_phase_uploader.cc',
       'browser/safe_browsing/two_phase_uploader.h',
     ],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index ae3f5d8..9b5d257 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1212,30 +1212,31 @@
         'browser/resources_util_unittest.cc',
         'browser/rlz/rlz_unittest.cc',
         'browser/safe_browsing/binary_feature_extractor_win_unittest.cc',
-        'browser/safe_browsing/binary_integrity_analyzer_win_unittest.cc',
-        'browser/safe_browsing/binary_integrity_incident_handlers_unittest.cc',
         'browser/safe_browsing/browser_feature_extractor_unittest.cc',
         'browser/safe_browsing/chunk_range_unittest.cc',
         'browser/safe_browsing/client_side_detection_host_unittest.cc',
         'browser/safe_browsing/client_side_detection_service_unittest.cc',
-        'browser/safe_browsing/delayed_callback_runner_unittest.cc',
         'browser/safe_browsing/database_manager_unittest.cc',
         'browser/safe_browsing/download_feedback_service_unittest.cc',
         'browser/safe_browsing/download_feedback_unittest.cc',
         'browser/safe_browsing/download_protection_service_unittest.cc',
-        'browser/safe_browsing/environment_data_collection_win_unittest.cc',
-        'browser/safe_browsing/incident_report_uploader_impl_unittest.cc',
-        'browser/safe_browsing/incident_reporting_service_unittest.cc',
-        'browser/safe_browsing/last_download_finder_unittest.cc',
+        'browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc',
+        'browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers_unittest.cc',
+        'browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc',
+        'browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc',
+        'browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc',
+        'browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc',
+        'browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc',
+        'browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.cc',
+        'browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h',
+        'browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc',
+        'browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc',
+        'browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers_unittest.cc',
         'browser/safe_browsing/local_two_phase_testserver.cc',
         'browser/safe_browsing/malware_details_unittest.cc',
-        'browser/safe_browsing/module_integrity_unittest_util_win.cc',
-        'browser/safe_browsing/module_integrity_unittest_util_win.h',
-        'browser/safe_browsing/module_integrity_verifier_win_unittest.cc',
         'browser/safe_browsing/path_sanitizer_unittest.cc',
         'browser/safe_browsing/pe_image_reader_win_unittest.cc',
         'browser/safe_browsing/ping_manager_unittest.cc',
-        'browser/safe_browsing/preference_validation_delegate_unittest.cc',
         'browser/safe_browsing/prefix_set_unittest.cc',
         'browser/safe_browsing/protocol_manager_unittest.cc',
         'browser/safe_browsing/protocol_parser_unittest.cc',
@@ -1244,7 +1245,6 @@
         'browser/safe_browsing/safe_browsing_store_file_unittest.cc',
         'browser/safe_browsing/safe_browsing_store_unittest.cc',
         'browser/safe_browsing/safe_browsing_util_unittest.cc',
-        'browser/safe_browsing/tracked_preference_incident_handlers_unittest.cc',
         'browser/safe_browsing/two_phase_uploader_unittest.cc',
         'browser/search/hotword_service_unittest.cc',
         'browser/search/iframe_source_unittest.cc',