From 37f355724a4557e8af4e3d9e62ff5633b16dedfb Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 Nov 2015 19:03:09 +0800
Subject: [PATCH] Move AtomCertVerifier to atom/browser/net

---
 atom/browser/api/atom_api_session.h          | 2 +-
 atom/browser/atom_browser_context.cc         | 2 +-
 atom/browser/{ => net}/atom_cert_verifier.cc | 2 +-
 atom/browser/{ => net}/atom_cert_verifier.h  | 6 +++---
 filenames.gypi                               | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename atom/browser/{ => net}/atom_cert_verifier.cc (99%)
 rename atom/browser/{ => net}/atom_cert_verifier.h (96%)

diff --git a/atom/browser/api/atom_api_session.h b/atom/browser/api/atom_api_session.h
index 05d67b8842..db72558db4 100644
--- a/atom/browser/api/atom_api_session.h
+++ b/atom/browser/api/atom_api_session.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/atom_cert_verifier.h"
+#include "atom/browser/net/atom_cert_verifier.h"
 #include "content/public/browser/download_manager.h"
 #include "native_mate/handle.h"
 #include "net/base/completion_callback.h"
diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc
index b1092757ae..ab3ab1bd13 100644
--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -5,10 +5,10 @@
 #include "atom/browser/atom_browser_context.h"
 
 #include "atom/browser/atom_browser_main_parts.h"
-#include "atom/browser/atom_cert_verifier.h"
 #include "atom/browser/atom_download_manager_delegate.h"
 #include "atom/browser/atom_ssl_config_service.h"
 #include "atom/browser/browser.h"
+#include "atom/browser/net/atom_cert_verifier.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
 #include "atom/browser/net/asar/asar_protocol_handler.h"
 #include "atom/browser/net/http_protocol_handler.h"
diff --git a/atom/browser/atom_cert_verifier.cc b/atom/browser/net/atom_cert_verifier.cc
similarity index 99%
rename from atom/browser/atom_cert_verifier.cc
rename to atom/browser/net/atom_cert_verifier.cc
index 0ff0d1e4a5..65e5582808 100644
--- a/atom/browser/atom_cert_verifier.cc
+++ b/atom/browser/net/atom_cert_verifier.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/atom_cert_verifier.h"
+#include "atom/browser/net/atom_cert_verifier.h"
 
 #include "atom/browser/browser.h"
 #include "atom/common/native_mate_converters/net_converter.h"
diff --git a/atom/browser/atom_cert_verifier.h b/atom/browser/net/atom_cert_verifier.h
similarity index 96%
rename from atom/browser/atom_cert_verifier.h
rename to atom/browser/net/atom_cert_verifier.h
index 50446dd38b..52b6fb5303 100644
--- a/atom/browser/atom_cert_verifier.h
+++ b/atom/browser/net/atom_cert_verifier.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_CERT_VERIFIER_H_
-#define ATOM_BROWSER_ATOM_CERT_VERIFIER_H_
+#ifndef ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
+#define ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
 
 #include <set>
 #include <string>
@@ -159,4 +159,4 @@ class AtomCertVerifier : public net::CertVerifier {
 
 }   // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_CERT_VERIFIER_H_
+#endif  // ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
diff --git a/filenames.gypi b/filenames.gypi
index fd8856abd4..92e0a2c204 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -131,8 +131,6 @@
       'atom/browser/atom_download_manager_delegate.h',
       'atom/browser/atom_browser_main_parts.cc',
       'atom/browser/atom_browser_main_parts.h',
-      'atom/browser/atom_cert_verifier.cc',
-      'atom/browser/atom_cert_verifier.h',
       'atom/browser/atom_browser_main_parts_mac.mm',
       'atom/browser/atom_browser_main_parts_posix.cc',
       'atom/browser/atom_javascript_dialog_manager.cc',
@@ -175,6 +173,8 @@
       'atom/browser/net/asar/asar_protocol_handler.h',
       'atom/browser/net/asar/url_request_asar_job.cc',
       'atom/browser/net/asar/url_request_asar_job.h',
+      'atom/browser/net/atom_cert_verifier.cc',
+      'atom/browser/net/atom_cert_verifier.h',
       'atom/browser/net/atom_url_request_job_factory.cc',
       'atom/browser/net/atom_url_request_job_factory.h',
       'atom/browser/net/http_protocol_handler.cc',