[Bringup] Fix security_state related linking error

EFL port needs to be implemented.

>> undefined reference to `security_state::GetSecurityInfo(...)

The chromium-efl does not support security_state.

Change-Id: Ic9332d2ba4e298a5d2ffb21d22d4450c97ba02bf
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index 22bca612a60afed41852408b2118dda6014c3a56..252e8dbf3e32eec0c1cdb04cbf7fb75877ff9d0f 100644 (file)
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -22,8 +22,11 @@
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
+// FIXME: The chromium-efl does not support security_state.
+#if !defined(USE_EFL)
 #include "components/security_state/content/content_utils.h"
 #include "components/security_state/core/security_state.h"
+#endif
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
@@ -238,10 +241,11 @@ content::ColorChooser* CommonWebContentsDelegate::OpenColorChooser(
     content::WebContents* web_contents,
     SkColor color,
     const std::vector<content::ColorSuggestion>& suggestions) {
-#if !defined(USE_EFL)
-  return chrome::ShowColorChooser(web_contents, color);
-#else
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
   return nullptr;
+#else
+  return chrome::ShowColorChooser(web_contents, color);
 #endif
 }
 
@@ -290,10 +294,15 @@ blink::WebSecurityStyle CommonWebContentsDelegate::GetSecurityStyle(
   SecurityStateTabHelper* helper =
       SecurityStateTabHelper::FromWebContents(web_contents);
   DCHECK(helper);
+  // FIXME: The chromium-efl does not support security_state.
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   security_state::SecurityInfo security_info;
   helper->GetSecurityInfo(&security_info);
   return security_state::GetSecurityStyle(security_info,
                                           security_style_explanations);
+#endif
 }
 
 void CommonWebContentsDelegate::DevToolsSaveToFile(

diff --git a/chromium_src/chrome/browser/ssl/security_state_tab_helper.cc b/chromium_src/chrome/browser/ssl/security_state_tab_helper.cc
index 81da2802ab294364c44dff3dd09f3b3242e6b955..5c299521df70fe909983639859af388bfd0ec303 100644 (file)
--- a/chromium_src/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chromium_src/chrome/browser/ssl/security_state_tab_helper.cc
@@ -17,7 +17,10 @@
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #endif
 #include "components/prefs/pref_service.h"
+// FIXME: The chromium-efl does not support security_state.
+#if !defined(USE_EFL)
 #include "components/security_state/content/content_utils.h"
+#endif
 #if 0
 #include "components/ssl_config/ssl_config_prefs.h"
 #endif
@@ -46,14 +49,21 @@ SecurityStateTabHelper::SecurityStateTabHelper(
 
 SecurityStateTabHelper::~SecurityStateTabHelper() {}
 
+// FIXME: The chromium-efl does not support security_state.
+#if !defined(USE_EFL)
 void SecurityStateTabHelper::GetSecurityInfo(
     security_state::SecurityInfo* result) const {
   security_state::GetSecurityInfo(GetVisibleSecurityState(),
                                   UsedPolicyInstalledCertificate(),
                                   base::Bind(&content::IsOriginSecure), result);
 }
+#endif
 
 void SecurityStateTabHelper::VisibleSecurityStateChanged() {
+// FIXME: The chromium-efl does not support security_state.
+#if defined(USE_EFL)
+  NOTIMPLEMENTED();
+#else
   if (logged_http_warning_on_current_navigation_)
     return;
 
@@ -102,6 +112,7 @@ void SecurityStateTabHelper::VisibleSecurityStateChanged() {
         "Security.HTTPBad.UserWarnedAboutSensitiveInput.Password",
         warning_is_user_visible);
   }
+#endif
 }
 
 void SecurityStateTabHelper::DidStartNavigation(
@@ -201,6 +212,8 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
 }
 #endif
 
+// FIXME: The chromium-efl does not support security_state.
+#if !defined(USE_EFL)
 std::unique_ptr<security_state::VisibleSecurityState>
 SecurityStateTabHelper::GetVisibleSecurityState() const {
   auto state = security_state::GetVisibleSecurityState(web_contents());
@@ -213,3 +226,4 @@ SecurityStateTabHelper::GetVisibleSecurityState() const {
 
   return state;
 }
+#endif

diff --git a/chromium_src/chrome/browser/ssl/security_state_tab_helper.h b/chromium_src/chrome/browser/ssl/security_state_tab_helper.h
index 13b256737c6eb1872c3f7556469efa939cf37fae..4da8da0eded277d6e3edb291a4879db444bd357b 100644 (file)
--- a/chromium_src/chrome/browser/ssl/security_state_tab_helper.h
+++ b/chromium_src/chrome/browser/ssl/security_state_tab_helper.h
@@ -8,7 +8,9 @@
 #include <memory>
 
 #include "base/macros.h"
+#if !defined(USE_EFL)
 #include "components/security_state/core/security_state.h"
+#endif
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "third_party/WebKit/public/platform/WebSecurityStyle.h"
@@ -26,9 +28,12 @@ class SecurityStateTabHelper
  public:
   ~SecurityStateTabHelper() override;
 
+  // FIXME: The chromium-efl does not support security_state.
+#if !defined(USE_EFL)
   // See security_state::GetSecurityInfo.
   void GetSecurityInfo(
       security_state::SecurityInfo* result) const;
+#endif
 
   // Called when the NavigationEntry's SSLStatus or other security
   // information changes.
@@ -49,8 +54,11 @@ class SecurityStateTabHelper
 #if 0
   security_state::MaliciousContentStatus GetMaliciousContentStatus() const;
 #endif
+  // FIXME: The chromium-efl does not support security_state.
+#if !defined(USE_EFL)
   std::unique_ptr<security_state::VisibleSecurityState>
   GetVisibleSecurityState() const;
+#endif
 
   // True if a console message has been logged about an omnibox warning that
   // will be shown in future versions of Chrome for insecure HTTP pages. This