[EG2] Prepare for converting external url eg test

Bug: 987646
Change-Id: I480e772f03e2cefe7e66a931bfabc96305cb50e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866924
Commit-Queue: Mohammad Refaat <mrefaat@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707464}

ios/chrome/browser/ui/omnibox/BUILD.gn

@@ -84,10 +84,24 @@ source_set("omnibox_util") {
     "//ios/chrome/browser/ui:feature_flags",
   ]
   public_deps = [
+    ":omnibox_icon_type_constants",
     "//ios/chrome/app/theme",
   ]
 }
 
+# This target can also be used on EG2 tests, so it should only contain constants
+source_set("omnibox_icon_type_constants") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  sources = [
+    "omnibox_icon_type.h",
+    "omnibox_icon_type.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("omnibox_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -161,6 +175,7 @@ source_set("omnibox_internal") {
     "//url",
   ]
   public_deps = [
+    ":omnibox_icon_type_constants",
     "//components/omnibox/browser",
   ]
   libs = [

ios/chrome/browser/ui/omnibox/omnibox_icon_type.h

+// Copyright 2019 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.
+
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_ICON_TYPE_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_ICON_TYPE_H_
+
+#import <Foundation/Foundation.h>
+
+// All available icons for security states.
+enum LocationBarSecurityIconType {
+  INSECURE = 0,
+  SECURE,
+  DANGEROUS,
+  LOCATION_BAR_SECURITY_ICON_TYPE_COUNT,
+};
+
+// Returns the asset name (to be used in -[UIImage imageNamed:]).
+NSString* GetLocationBarSecurityIconTypeAssetName(
+    LocationBarSecurityIconType icon);
+
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_ICON_TYPE_H_

ios/chrome/browser/ui/omnibox/omnibox_icon_type.mm

+// Copyright 2019 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.
+
+#import "ios/chrome/browser/ui/omnibox/omnibox_icon_type.h"
+
+#include "base/logging.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+NSString* GetLocationBarSecurityIconTypeAssetName(
+    LocationBarSecurityIconType iconType) {
+  switch (iconType) {
+    case INSECURE:
+      return @"location_bar_insecure";
+    case SECURE:
+      return @"location_bar_secure";
+    case DANGEROUS:
+      return @"location_bar_dangerous";
+    case LOCATION_BAR_SECURITY_ICON_TYPE_COUNT:
+      NOTREACHED();
+      return @"location_bar_insecure";
+  }
+}

ios/chrome/browser/ui/omnibox/omnibox_util.h

@@ -9,6 +9,7 @@
 
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/security_state/core/security_state.h"
+#import "ios/chrome/browser/ui/omnibox/omnibox_icon_type.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.h"
 
 #pragma mark - Suggestion icons.
@@ -27,18 +28,6 @@ UIImage* GetOmniboxSuggestionIconForAutocompleteMatchType(
 
 #pragma mark - Security icons.
 
-// All available icons for security states.
-enum LocationBarSecurityIconType {
-  INSECURE = 0,
-  SECURE,
-  DANGEROUS,
-  LOCATION_BAR_SECURITY_ICON_TYPE_COUNT,
-};
-
-// Returns the asset name (to be used in -[UIImage imageNamed:]).
-NSString* GetLocationBarSecurityIconTypeAssetName(
-    LocationBarSecurityIconType icon);
-
 // Returns the asset with "always template" rendering mode.
 UIImage* GetLocationBarSecurityIcon(LocationBarSecurityIconType icon);
 

ios/chrome/browser/ui/omnibox/omnibox_util.mm

@@ -78,21 +78,6 @@ UIImage* GetOmniboxSuggestionIconForAutocompleteMatchType(
 
 #pragma mark - Security icons.
 
-NSString* GetLocationBarSecurityIconTypeAssetName(
-    LocationBarSecurityIconType iconType) {
-  switch (iconType) {
-    case INSECURE:
-      return @"location_bar_insecure";
-    case SECURE:
-      return @"location_bar_secure";
-    case DANGEROUS:
-      return @"location_bar_dangerous";
-    case LOCATION_BAR_SECURITY_ICON_TYPE_COUNT:
-      NOTREACHED();
-      return @"location_bar_insecure";
-  }
-}
-
 // Returns the asset with "always template" rendering mode.
 UIImage* GetLocationBarSecurityIcon(LocationBarSecurityIconType iconType) {
   NSString* imageName = GetLocationBarSecurityIconTypeAssetName(iconType);

ios/chrome/test/app/BUILD.gn

@@ -8,12 +8,13 @@ source_set("test_support") {
   sources = [
     "bookmarks_test_util.h",
     "bookmarks_test_util.mm",
+    "browsing_data_test_util.h",
+    "browsing_data_test_util.mm",
     "chrome_test_util.h",
     "chrome_test_util.mm",
     "histogram_test_util.h",
     "histogram_test_util.mm",
     "history_test_util.h",
-    "history_test_util.mm",
     "navigation_test_util.h",
     "navigation_test_util.mm",
     "password_test_util.h",
@@ -86,6 +87,7 @@ source_set("test_support") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin:test_support",
     "//ios/web",
+    "//ios/web/public/security",
     "//ios/web/public/test",
     "//net",
     "//net:test_support",

ios/chrome/test/app/browsing_data_test_util.h

+// Copyright 2019 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.
+
+#ifndef IOS_CHROME_TEST_APP_BROWSING_DATA_TEST_UTIL_H_
+#define IOS_CHROME_TEST_APP_BROWSING_DATA_TEST_UTIL_H_
+
+#include "base/compiler_specific.h"
+
+namespace chrome_test_util {
+
+// Clears browsing history and returns whether clearing the history was
+// successful or timed out.
+bool ClearBrowsingHistory() WARN_UNUSED_RESULT;
+
+// Clears browsing data and returns whether clearing was successful or timed
+// out.
+bool ClearAllBrowsingData(bool off_the_record) WARN_UNUSED_RESULT;
+
+// Clears user decisions cache and returns whether clearing was successful or
+// timed out.
+bool ClearCertificatePolicyCache(bool off_the_record) WARN_UNUSED_RESULT;
+
+}  // namespace chrome_test_util
+
+#endif  // IOS_CHROME_TEST_APP_BROWSING_DATA_TEST_UTIL_H_

ios/chrome/test/app/history_test_util.mm → ios/chrome/test/app/browsing_data_test_util.mm

@@ -2,34 +2,71 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/test/app/history_test_util.h"
+#import "ios/chrome/test/app/browsing_data_test_util.h"
 
+#include "base/task/post_task.h"
 #import "base/test/ios/wait_util.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #import "ios/chrome/app/main_controller.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/browsing_data/browsing_data_remove_mask.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
+#include "ios/web/public/security/certificate_policy_cache.h"
+#include "ios/web/public/thread/web_task_traits.h"
+#include "ios/web/public/thread/web_thread.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-namespace chrome_test_util {
+using base::test::ios::WaitUntilConditionOrTimeout;
+
+namespace {
+
+bool ClearBrowsingData(bool off_the_record, BrowsingDataRemoveMask mask) {
+  ios::ChromeBrowserState* browser_state =
+      off_the_record ? chrome_test_util::GetCurrentIncognitoBrowserState()
+                     : chrome_test_util::GetOriginalBrowserState();
 
-bool ClearBrowsingHistory() {
   __block bool did_complete = false;
-  [GetMainController()
-      removeBrowsingDataForBrowserState:GetOriginalBrowserState()
+  [chrome_test_util::GetMainController()
+      removeBrowsingDataForBrowserState:browser_state
                              timePeriod:browsing_data::TimePeriod::ALL_TIME
-                             removeMask:BrowsingDataRemoveMask::REMOVE_HISTORY
+                             removeMask:mask
                         completionBlock:^{
                           did_complete = true;
                         }];
-  return base::test::ios::WaitUntilConditionOrTimeout(
+  return WaitUntilConditionOrTimeout(
       base::test::ios::kWaitForClearBrowsingDataTimeout, ^{
         return did_complete;
       });
 }
+}  // namespace
+
+namespace chrome_test_util {
+
+bool ClearBrowsingHistory() {
+  return ClearBrowsingData(/*off_the_record=*/false,
+                           BrowsingDataRemoveMask::REMOVE_HISTORY);
+}
+
+bool ClearAllBrowsingData(bool off_the_record) {
+  return ClearBrowsingData(off_the_record, BrowsingDataRemoveMask::REMOVE_ALL);
+}
+
+bool ClearCertificatePolicyCache(bool off_the_record) {
+  ios::ChromeBrowserState* browser_state =
+      off_the_record ? GetCurrentIncognitoBrowserState()
+                     : GetOriginalBrowserState();
+  auto cache = web::BrowserState::GetCertificatePolicyCache(browser_state);
+  __block BOOL policies_cleared = NO;
+  base::PostTask(FROM_HERE, {web::WebThread::IO}, base::BindOnce(^{
+                   cache->ClearCertificatePolicies();
+                   policies_cleared = YES;
+                 }));
+  return WaitUntilConditionOrTimeout(2, ^{
+    return policies_cleared;
+  });
+}
 
 }  // namespace chrome_test_util

ios/chrome/test/app/history_test_util.h

@@ -5,14 +5,6 @@
 #ifndef IOS_CHROME_TEST_APP_HISTORY_TEST_UTIL_H_
 #define IOS_CHROME_TEST_APP_HISTORY_TEST_UTIL_H_
 
-#include "base/compiler_specific.h"
-
-namespace chrome_test_util {
-
-// Clears browsing history and returns whether clearing the history was
-// successful or timed out.
-bool ClearBrowsingHistory() WARN_UNUSED_RESULT;
-
-}  // namespace chrome_test_util
+#import "ios/chrome/test/app/browsing_data_test_util.h"
 
 #endif  // IOS_CHROME_TEST_APP_HISTORY_TEST_UTIL_H_

ios/chrome/test/earl_grey/chrome_earl_grey.mm

@@ -20,16 +20,16 @@
 #import <WebKit/WebKit.h>
 
 #import "ios/chrome/browser/ui/static_content/static_html_view_controller.h"  // nogncheck
-#import "ios/chrome/test/app/chrome_test_util.h"                   // nogncheck
-#import "ios/chrome/test/app/history_test_util.h"                  // nogncheck
-#include "ios/chrome/test/app/navigation_test_util.h"              // nogncheck
-#import "ios/chrome/test/app/sync_test_util.h"                     // nogncheck
-#import "ios/chrome/test/app/tab_test_util.h"                      // nogncheck
-#import "ios/web/public/deprecated/crw_js_injection_receiver.h"    // nogncheck
-#import "ios/web/public/test/earl_grey/js_test_util.h"             // nogncheck
-#import "ios/web/public/test/web_view_content_test_util.h"         // nogncheck
-#import "ios/web/public/test/web_view_interaction_test_util.h"     // nogncheck
-#import "ios/web/public/web_state.h"                               // nogncheck
+#import "ios/chrome/test/app/browsing_data_test_util.h"          // nogncheck
+#import "ios/chrome/test/app/chrome_test_util.h"                 // nogncheck
+#include "ios/chrome/test/app/navigation_test_util.h"            // nogncheck
+#import "ios/chrome/test/app/sync_test_util.h"                   // nogncheck
+#import "ios/chrome/test/app/tab_test_util.h"                    // nogncheck
+#import "ios/web/public/deprecated/crw_js_injection_receiver.h"  // nogncheck
+#import "ios/web/public/test/earl_grey/js_test_util.h"           // nogncheck
+#import "ios/web/public/test/web_view_content_test_util.h"       // nogncheck
+#import "ios/web/public/test/web_view_interaction_test_util.h"   // nogncheck
+#import "ios/web/public/web_state.h"                             // nogncheck
 #endif
 
 using base::test::ios::kWaitForJSCompletionTimeout;

ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm

@@ -18,8 +18,8 @@
 #import "ios/chrome/browser/ui/util/named_guide.h"
 #import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/test/app/bookmarks_test_util.h"
+#import "ios/chrome/test/app/browsing_data_test_util.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
-#import "ios/chrome/test/app/history_test_util.h"
 #include "ios/chrome/test/app/navigation_test_util.h"
 #include "ios/chrome/test/app/settings_test_util.h"
 #import "ios/chrome/test/app/signin_test_util.h"