Revert "[WebLayer] Move browserservices.Origin to //components/embedd…

…er_support"

This reverts commit b2882c2.

Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1061766

Original change's description:
> [WebLayer] Move browserservices.Origin to //components/embedder_support
> 
> browserservices.Origin is used by Chrome's site settings page, which
> is being componentized so it can be used by WebLayer. This CL moves
> the class to //components/embedder_support.
> 
> Bug: 1058597
> Change-Id: Ic47da47f372d1c27238efd2fee8d7bdcba6eb63d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090875
> Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
> Reviewed-by: Theresa  <twellington@chromium.org>
> Reviewed-by: Bo <boliu@chromium.org>
> Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#750294}

TBR=jam@chromium.org,boliu@chromium.org,twellington@chromium.org,jdoerrie@chromium.org,rmcelrath@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

(cherry picked from commit 3a4ab5d)

Bug: 1058597, 1061766
Change-Id: I90a44c5f6168133d90efb254649e776f4e395e0e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2104367
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#750434}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2105399
Reviewed-by: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/branch-heads/4086@{#2}
Cr-Branched-From: a0e10d7-refs/heads/master@{#750400}

BUILD.gn

@@ -333,7 +333,6 @@ group("gn_all") {
       "//chrome/android/webapk/shell_apk:webapk",
       "//chrome/android/webapk/shell_apk/prepare_upload_dir:prepare_webapk_shell_upload_dir",
       "//chrome/test:android_browsertests",
-      "//components/embedder_support/android:components_embedder_support_junit_tests",
       "//components/permissions/android:components_permissions_junit_tests",
       "//components/policy/android:components_policy_junit_tests",
       "//components/signin/core/browser/android:components_signin_junit_tests",

chrome/android/chrome_java_sources.gni

@@ -166,6 +166,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java",
   "java/src/org/chromium/chrome/browser/browserservices/ClientAppDataRegister.java",
   "java/src/org/chromium/chrome/browser/browserservices/ManageTrustedWebActivityDataActivity.java",
+  "java/src/org/chromium/chrome/browser/browserservices/Origin.java",
   "java/src/org/chromium/chrome/browser/browserservices/OriginVerifier.java",
   "java/src/org/chromium/chrome/browser/browserservices/PostMessageHandler.java",
   "java/src/org/chromium/chrome/browser/browserservices/Relationship.java",

chrome/android/chrome_junit_test_java_sources.gni

@@ -17,6 +17,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/browserservices/ClearDataDialogResultRecorderTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiverTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/ClientAppDataRegisterTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/OriginTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/SessionDataHolderTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClientTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationChannelPreserverTest.java",

chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java

@@ -14,7 +14,6 @@
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.browserservices.permissiondelegation.NotificationPermissionUpdater;
 import org.chromium.chrome.browser.metrics.WebApkUma;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.webapk.lib.common.WebApkConstants;
 
 import java.util.Arrays;

chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppDataRegister.java

@@ -13,7 +13,6 @@
 import org.chromium.base.StrictModeContext;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
-import org.chromium.components.embedder_support.util.Origin;
 
 import java.util.Collections;
 import java.util.HashSet;

components/embedder_support/android/java/src/org/chromium/components/embedder_support/util/Origin.java → chrome/android/java/src/org/chromium/chrome/browser/browserservices/Origin.java

@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.components.embedder_support.util;
+package org.chromium.chrome.browser.browserservices;
 
 import android.net.Uri;
 
 import androidx.annotation.Nullable;
 
+import org.chromium.components.embedder_support.util.UrlConstants;
+
 /**
  * A class to canonically represent a HTTP or HTTPS web origin in Java. In comparison to
  * {@link org.chromium.net.GURLUtils#getOrigin} it can be used before native is loaded and lets us
@@ -64,13 +66,13 @@ public static Origin create(Uri uri) {
 
         try {
             return new Origin(uri.normalizeScheme()
-                                      .buildUpon()
-                                      .opaquePart("")
-                                      .fragment("")
-                                      .path("")
-                                      .encodedAuthority(authority)
-                                      .clearQuery()
-                                      .build());
+                    .buildUpon()
+                    .opaquePart("")
+                    .fragment("")
+                    .path("")
+                    .encodedAuthority(authority)
+                    .clearQuery()
+                    .build());
         } catch (UnsupportedOperationException e) {
             return null;
         }

chrome/android/java/src/org/chromium/chrome/browser/browserservices/OriginVerifier.java

@@ -29,7 +29,6 @@
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.BrowserStartupController;
 import org.chromium.content_public.browser.UiThreadTaskTraits;

chrome/android/java/src/org/chromium/chrome/browser/browserservices/PostMessageHandler.java

@@ -15,7 +15,6 @@
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.browser.browserservices.OriginVerifier.OriginVerificationListener;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.MessagePort;
 import org.chromium.content_public.browser.MessagePort.MessageCallback;
 import org.chromium.content_public.browser.NavigationHandle;

chrome/android/java/src/org/chromium/chrome/browser/browserservices/Relationship.java

@@ -4,8 +4,6 @@
 
 package org.chromium.chrome.browser.browserservices;
 
-import org.chromium.components.embedder_support.util.Origin;
-
 /**
  * This is a plain-old-data class to store a Digital Asset Link relationship [1].
  *

chrome/android/java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClient.java

@@ -38,7 +38,6 @@
 import org.chromium.chrome.browser.notifications.NotificationBuilderBase;
 import org.chromium.chrome.browser.notifications.NotificationMetadata;
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 

chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java

@@ -6,8 +6,8 @@
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.site_settings.ContentSettingValues;
-import org.chromium.components.embedder_support.util.Origin;
 
 /**
  * Provides Trusted Web Activity Client App permissions for native. The C++ counterpart is the

chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationChannelPreserver.java

@@ -6,10 +6,10 @@
 
 import android.os.Build;
 
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.notifications.NotificationChannelStatus;
 import org.chromium.chrome.browser.notifications.channels.ChannelDefinitions;
 import org.chromium.chrome.browser.notifications.channels.SiteChannelsManager;
-import org.chromium.components.embedder_support.util.Origin;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationPermissionUpdater.java

@@ -14,8 +14,8 @@
 import org.chromium.base.PackageManagerUtils;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.browser.browserservices.BrowserServicesMetrics;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.TrustedWebActivityClient;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 
 import javax.inject.Inject;

chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionManager.java

@@ -19,8 +19,8 @@
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.site_settings.ContentSettingValues;
-import org.chromium.components.embedder_support.util.Origin;
 
 import java.util.ArrayList;
 import java.util.List;

chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionStore.java

@@ -8,19 +8,19 @@
 import android.content.SharedPreferences;
 import android.util.Base64;
 
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-import androidx.browser.trusted.Token;
-
 import org.chromium.base.ContextUtils;
 import org.chromium.base.StrictModeContext;
-import org.chromium.components.embedder_support.util.Origin;
+import org.chromium.chrome.browser.browserservices.Origin;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
+import androidx.browser.trusted.Token;
+
 /**
  * Stores data about origins associated with a Trusted Web Activity for the purpose of Permission
  * Delegation. Primarily we store (indexed by origin):

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TrustedWebActivityCoordinator.java

@@ -9,6 +9,7 @@
 import androidx.browser.trusted.TrustedWebActivityDisplayMode.ImmersiveMode;
 
 import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.TrustedWebActivityUmaRecorder;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.ClientPackageNameProvider;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.CurrentPageVerifier;
@@ -31,7 +32,6 @@
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.InflationObserver;
 import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
-import org.chromium.components.embedder_support.util.Origin;
 
 import javax.inject.Inject;
 

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/ClientAppDataRecorder.java

@@ -13,8 +13,8 @@
 
 import org.chromium.base.Log;
 import org.chromium.chrome.browser.browserservices.ClientAppDataRegister;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.components.embedder_support.util.UrlUtilities;
 
 import java.util.HashSet;

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaRegistrar.java

@@ -8,8 +8,8 @@
 
 import android.content.Context;
 
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.permissiondelegation.NotificationPermissionUpdater;
-import org.chromium.components.embedder_support.util.Origin;
 
 import java.util.HashSet;
 import java.util.Set;

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaVerifier.java

@@ -4,17 +4,14 @@
 
 package org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller;
 
-import androidx.annotation.Nullable;
-import androidx.browser.customtabs.CustomTabsService;
-
 import org.chromium.base.Promise;
 import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.OriginVerifier;
 import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.Destroyable;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.WebContents;
 
 import java.util.HashSet;
@@ -23,6 +20,9 @@
 
 import javax.inject.Inject;
 
+import androidx.annotation.Nullable;
+import androidx.browser.customtabs.CustomTabsService;
+
 /**
  * Provides Trusted Web Activity specific behaviour for the {@link CurrentPageVerifier}.
  */

chrome/android/java/src/org/chromium/chrome/browser/customtabs/ClientManager.java

@@ -30,12 +30,12 @@
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.browser.IntentHandler;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.OriginVerifier;
 import org.chromium.chrome.browser.browserservices.OriginVerifier.OriginVerificationListener;
 import org.chromium.chrome.browser.browserservices.PostMessageHandler;
 import org.chromium.chrome.browser.installedapp.InstalledAppProviderImpl;
 import org.chromium.chrome.browser.installedapp.PackageManagerDelegate;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.content_public.browser.WebContents;

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java

@@ -19,6 +19,7 @@
 
 import org.chromium.base.Log;
 import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.OriginVerifier;
 import org.chromium.chrome.browser.browserservices.SessionDataHolder;
 import org.chromium.chrome.browser.browserservices.SessionHandler;
@@ -29,7 +30,6 @@
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.StartStopWithNativeObserver;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.NavigationEntry;
 
 import javax.inject.Inject;

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java

@@ -51,6 +51,7 @@
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.WarmupManager;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.PostMessageHandler;
 import org.chromium.chrome.browser.browserservices.SessionDataHolder;
 import org.chromium.chrome.browser.browserservices.SessionHandler;
@@ -65,7 +66,6 @@
 import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.BrowserStartupController;
 import org.chromium.content_public.browser.ChildProcessLauncherHelper;

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java

@@ -14,9 +14,9 @@
 import androidx.browser.customtabs.CustomTabsService;
 import androidx.browser.customtabs.CustomTabsSessionToken;
 
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
 import org.chromium.chrome.browser.init.ProcessInitializationHandler;
-import org.chromium.components.embedder_support.util.Origin;
 
 import java.util.List;
 

chrome/android/java/src/org/chromium/chrome/browser/page_info/PermissionParamsListBuilder.java

@@ -17,13 +17,13 @@
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Callback;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.permissiondelegation.TrustedWebActivityPermissionManager;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.site_settings.ContentSettingValues;
 import org.chromium.chrome.browser.site_settings.ContentSettingsResources;
 import org.chromium.chrome.browser.site_settings.WebsitePreferenceBridge;
 import org.chromium.components.content_settings.ContentSettingsType;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.components.location.LocationUtils;
 import org.chromium.components.page_info.PageInfoView;
 import org.chromium.components.page_info.SystemSettingsActivityRequiredListener;

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -1331,8 +1331,8 @@ private boolean openPaymentHandlerWindowInternal(
             URI url, PaymentHandlerWebContentsObserver paymentHandlerWebContentsObserver) {
         assert mInvokedPaymentApp != null;
         assert mInvokedPaymentApp instanceof ServiceWorkerPaymentApp;
-        assert org.chromium.components.embedder_support.util.Origin.create(url.toString())
-                .equals(org.chromium.components.embedder_support.util.Origin.create(
+        assert org.chromium.chrome.browser.browserservices.Origin.create(url.toString())
+                .equals(org.chromium.chrome.browser.browserservices.Origin.create(
                         ((ServiceWorkerPaymentApp) mInvokedPaymentApp).getScope().toString()));
 
         if (mPaymentHandlerUi != null) return false;

chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java

@@ -28,6 +28,7 @@
 import org.chromium.base.Callback;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.browserservices.permissiondelegation.TrustedWebActivityPermissionManager;
 import org.chromium.chrome.browser.notifications.channels.SiteChannelsManager;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -36,7 +37,6 @@
 import org.chromium.chrome.browser.settings.ManagedPreferencesUtils;
 import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.components.content_settings.ContentSettingsType;
-import org.chromium.components.embedder_support.util.Origin;
 
 import java.util.Arrays;
 import java.util.Collection;

chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/OriginVerifierTest.java

@@ -26,7 +26,6 @@
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.content_public.browser.test.mock.MockWebContents;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;

chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClientTest.java

@@ -35,7 +35,6 @@
 import org.chromium.chrome.browser.dependency_injection.ChromeAppComponent;
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
 import org.chromium.chrome.browser.notifications.StandardNotificationBuilder;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 
 import java.util.Collections;

chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityTestUtil.java

@@ -15,7 +15,6 @@
 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.customtabs.CustomTabsTestUtils;
 import org.chromium.chrome.browser.tab.TabBrowserControlsConstraintsHelper;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.content_public.common.BrowserControlsState;
 

chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionsTest.java

@@ -22,11 +22,11 @@
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.background_sync.BackgroundSyncPwaDetector;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.customtabs.CustomTabActivityTestRule;
 import org.chromium.chrome.browser.customtabs.CustomTabsTestUtils;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.net.test.ServerCertificate;

chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPreferencesUiTest.java

@@ -18,6 +18,7 @@
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.browserservices.Origin;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.settings.ChromeImageViewPreference;
 import org.chromium.chrome.browser.settings.ExpandablePreferenceGroup;
@@ -30,7 +31,6 @@
 import org.chromium.chrome.browser.site_settings.WebsiteAddress;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
-import org.chromium.components.embedder_support.util.Origin;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;