Move CertificateManagerModel and CertificateViewer back to chrome. Nothing uses them in content.

Review URL: http://codereview.chromium.org/7021011

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

17 files changed, 25 insertions, 30 deletions

diff --git a/content/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index 489fb8c..be4a21f 100644
--- a/content/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.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 "content/browser/certificate_manager_model.h"
+#include "chrome/browser/certificate_manager_model.h"
 
 #include "base/callback_old.h"
 #include "base/i18n/time_formatting.h"
diff --git a/content/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h
index 3d6b9ed..eda1f53 100644
--- a/content/browser/certificate_manager_model.h
+++ b/chrome/browser/certificate_manager_model.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 CONTENT_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
-#define CONTENT_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#ifndef CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
 
 #include <map>
 #include <string>
@@ -112,4 +112,4 @@ class CertificateManagerModel {
   DISALLOW_COPY_AND_ASSIGN(CertificateManagerModel);
 };
 
-#endif  // CONTENT_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#endif  // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
diff --git a/content/browser/certificate_viewer.cc b/chrome/browser/certificate_viewer.cc
index 3d92e7a..09aed6f 100644
--- a/content/browser/certificate_viewer.cc
+++ b/chrome/browser/certificate_viewer.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 "content/browser/certificate_viewer.h"
+#include "chrome/browser/certificate_viewer.h"
 
 #include "content/browser/cert_store.h"
 
diff --git a/content/browser/certificate_viewer.h b/chrome/browser/certificate_viewer.h
index 8fa8befe..89b0e04 100644
--- a/content/browser/certificate_viewer.h
+++ b/chrome/browser/certificate_viewer.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 CONTENT_BROWSER_CERTIFICATE_VIEWER_H_
-#define CONTENT_BROWSER_CERTIFICATE_VIEWER_H_
+#ifndef CHROME_BROWSER_CERTIFICATE_VIEWER_H_
+#define CHROME_BROWSER_CERTIFICATE_VIEWER_H_
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
@@ -22,4 +22,4 @@ void ShowCertificateViewerByID(gfx::NativeWindow parent, int cert_id);
 void ShowCertificateViewer(gfx::NativeWindow parent,
                            net::X509Certificate* cert);
 
-#endif  // CONTENT_BROWSER_CERTIFICATE_VIEWER_H_
+#endif  // CHROME_BROWSER_CERTIFICATE_VIEWER_H_
diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
index bf05599..b1ae045 100644
--- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
+++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
@@ -7,12 +7,12 @@
 #include "base/basictypes.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
 #include "chrome/browser/ssl/ssl_client_auth_handler.h"
 #include "chrome/browser/ssl_client_certificate_selector.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
-#include "content/browser/certificate_viewer.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
diff --git a/chrome/browser/ui/cocoa/certificate_viewer.mm b/chrome/browser/ui/cocoa/certificate_viewer.mm
index 563eb26..8c5a954 100644
--- a/chrome/browser/ui/cocoa/certificate_viewer.mm
+++ b/chrome/browser/ui/cocoa/certificate_viewer.mm
@@ -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 "content/browser/certificate_viewer.h"
+#include "chrome/browser/certificate_viewer.h"
 
 #include <Security/Security.h>
 #include <SecurityInterface/SFCertificatePanel.h>
diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
index d2911d3..6b06d8e 100644
--- a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
@@ -7,6 +7,7 @@
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -17,7 +18,6 @@
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/cert_store.h"
-#include "content/browser/certificate_viewer.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/cert_status_flags.h"
diff --git a/chrome/browser/ui/gtk/certificate_viewer.h b/chrome/browser/ui/gtk/certificate_viewer.h
index 02c0c0a..c31477c 100644
--- a/chrome/browser/ui/gtk/certificate_viewer.h
+++ b/chrome/browser/ui/gtk/certificate_viewer.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_GTK_CERTIFICATE_VIEWER_H_
 #pragma once
 
-#include "content/browser/certificate_viewer.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "net/base/x509_certificate.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
index f30335a..af0f9de 100644
--- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
@@ -8,6 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_window.h"
@@ -20,7 +21,6 @@
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/certificate_viewer.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
index f12161a..f13c7ef 100644
--- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
@@ -12,6 +12,7 @@
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ssl/ssl_client_auth_handler.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
@@ -19,7 +20,6 @@
 #include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/certificate_viewer.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/x509_certificate.h"
diff --git a/chrome/browser/ui/views/certificate_viewer_win.cc b/chrome/browser/ui/views/certificate_viewer_win.cc
index b86cfea..ba54267 100644
--- a/chrome/browser/ui/views/certificate_viewer_win.cc
+++ b/chrome/browser/ui/views/certificate_viewer_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 "content/browser/certificate_viewer.h"
+#include "chrome/browser/certificate_viewer.h"
 
 #include <windows.h>
 #include <cryptuiapi.h>
diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc
index ecdf526..609f554 100644
--- a/chrome/browser/ui/views/page_info_bubble_view.cc
+++ b/chrome/browser/ui/views/page_info_bubble_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/page_info_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/bubble/bubble.h"
@@ -12,7 +13,6 @@
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/cert_store.h"
-#include "content/browser/certificate_viewer.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index ee045b0..6e98b11 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -10,10 +10,10 @@
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #include "chrome/browser/ui/gtk/certificate_dialogs.h"
 #include "content/browser/browser_thread.h"  // for FileAccessProvider
-#include "content/browser/certificate_viewer.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h
index 5a33015..f363be2 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.h
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h
@@ -9,10 +9,10 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/certificate_manager_model.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "content/browser/cancelable_request.h"
-#include "content/browser/certificate_manager_model.h"
 #include "net/base/cert_database.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e64de74..ca82523 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -330,6 +330,10 @@
         'browser/bug_report_data.h',
         'browser/bug_report_util.cc',
         'browser/bug_report_util.h',
+        'browser/certificate_manager_model.cc',
+        'browser/certificate_manager_model.h',
+        'browser/certificate_viewer.cc',
+        'browser/certificate_viewer.h',
         # TODO(rkc): Find a better way to include these files
         '<(protoc_out_dir)/chrome/browser/userfeedback/proto/annotations.pb.cc',
         '<(protoc_out_dir)/chrome/browser/userfeedback/proto/chrome.pb.cc',
@@ -3638,6 +3642,9 @@
           ],
         }, {  # OS != "linux"
           'sources!': [
+            # TODO(mattm): Cert manager stuff is really !USE_NSS.
+            'browser/certificate_manager_model.cc',
+            'browser/certificate_manager_model.h',
             'browser/ui/webui/options/certificate_manager_handler.cc',
             'browser/ui/webui/options/certificate_manager_handler.h',
           ],
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 38fc3cb..b341d06 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -124,8 +124,6 @@ include_rules = [
 

   "+chrome/common/view_types.h",

 

-  "+chrome/common/net/x509_certificate_model.h",

-

   # ONLY USED BY TESTS

   "+chrome/browser/chromeos/cros/mock_network_library.h",

   "+chrome/browser/net/url_request_failed_dns_job.h",

diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index c930b44..322abdb 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -42,10 +42,6 @@
         'browser/cancelable_request.h',
         'browser/cert_store.cc',
         'browser/cert_store.h',
-        'browser/certificate_manager_model.cc',
-        'browser/certificate_manager_model.h',
-        'browser/certificate_viewer.cc',
-        'browser/certificate_viewer.h',
         'browser/child_process_launcher.cc',
         'browser/child_process_launcher.h',
         'browser/child_process_security_policy.cc',
@@ -372,12 +368,6 @@
             # For XShm* in backing_store_x.cc
             '../build/linux/system.gyp:x11',
           ],
-        }, {  # OS != "linux"
-          'sources!': [
-            # TODO(mattm): Cert manager stuff is really !USE_NSS.
-            'browser/certificate_manager_model.cc',
-            'browser/certificate_manager_model.h',
-          ],
         }],
         ['OS=="linux" and chromeos==1', {
           'sources/': [