Merge pull request #95 from devjangid15/chromium

WootzApp UI Change
wootzapp · Jul 3, 2024 · 104d54a · 104d54a
2 parents f60883b + 68dfe5d
commit 104d54a
Show file tree

Hide file tree

Showing 226 changed files with 4,177 additions and 872 deletions.
diff --git a/src/android_webview/test/data/prerender-no-vary-search-multiple-params.html b/src/android_webview/test/data/prerender-no-vary-search-multiple-params.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+  </body>
+  <script src="prerender-test-setup.js"></script>
+</html>
diff --git a/...android_webview/test/data/prerender-no-vary-search-multiple-params.html.mock-http-headers b/...android_webview/test/data/prerender-no-vary-search-multiple-params.html.mock-http-headers
@@ -0,0 +1,2 @@
+HTTP/1.1 200 OK
+No-Vary-Search: key-order, params, except=("a" "c")
diff --git a/src/android_webview/test/data/prerender-test-setup.js b/src/android_webview/test/data/prerender-test-setup.js
@@ -0,0 +1,27 @@
+// Copyright 2024 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Objects starting with the "aw" prefix are injected by AwPrerenderTest.
+
+function createIframe(url) {
+  const iframe = document.createElement('iframe');
+  iframe.setAttribute('src', url);
+  document.body.appendChild(iframe);
+}
+
+function wasActivated() {
+  return self.performance?.getEntriesByType?.('navigation')[0]
+             ?.activationStart > 0;
+}
+
+const wasPrerendered = document.prerendering || wasActivated();
+
+if (wasActivated()) {
+  awActivationFuture.activated();
+} else {
+  document.onprerenderingchange = () => awActivationFuture.activated();
+}
+
+// Notify the primary page that this prerendered page started.
+window.localStorage.setItem('pageStarted', location.href);
diff --git a/src/ash/webui/os_feedback_ui/resources/feedback_constants.ts b/src/ash/webui/os_feedback_ui/resources/feedback_constants.ts
@@ -5,6 +5,6 @@
 export const FEEDBACK_LEGAL_HELP_URL =
     'https://support.google.com/legal/answer/3110420';
 export const FEEDBACK_PRIVACY_POLICY_URL =
-    'https://policies.google.com/privacy';
+    'https://www.wootzapp.com/privacy';
 export const FEEDBACK_TERMS_OF_SERVICE_URL =
     'https://policies.google.com/terms';
diff --git a/src/chrome/android/chrome_java_resources.gni b/src/chrome/android/chrome_java_resources.gni
@@ -616,7 +616,7 @@ chrome_java_resources = [
   "java/res/values/strings.xml",
   "java/res/values/styles.xml",
   "java/res/values/values.xml",
-  "java/res/xml/about_chrome_preferences.xml",
+  "java/res/xml/about_wootzapp_preferences.xml",
   "java/res/xml/account_management_preferences.xml",
   "java/res/xml/ad_services_config.xml",
   "java/res/xml/bookmark_widget_info.xml",

diff --git a/...i/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListEditorShareAction.java b/...i/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListEditorShareAction.java
@@ -182,7 +182,7 @@ public boolean performAction(List<Tab> tabs) {
                         R.dimen.tab_list_editor_share_sheet_preview_thumbnail_padding);
         Drawable drawable =
                 new InsetDrawable(
-                        AppCompatResources.getDrawable(context, R.drawable.chrome_sync_logo),
+                        AppCompatResources.getDrawable(context, R.drawable.wootzapp_sync_logo),
                         (int) padding);
 
         // Create a custom share intent and receiver to assess if another app receives the share

diff --git a/...rome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/...rome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
@@ -812,7 +812,7 @@ private boolean shouldShowSigninPromo() {
         SyncPromoController.resetNtpSyncPromoLimitsIfHiddenForTooLong();
         // TODO(crbug.com/41493776): Update the bottom sheet subtitle string.
         AccountPickerBottomSheetStrings bottomSheetStrings =
-                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_chrome).build();
+                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_wootzapp).build();
         SyncPromoController promoController =
                 new SyncPromoController(
                         mProfile,

diff --git a/src/chrome/android/java/res/layout/radio_button_group_homepage_preference.xml b/src/chrome/android/java/res/layout/radio_button_group_homepage_preference.xml
@@ -35,7 +35,7 @@ found in the LICENSE file.
         android:id="@+id/radio_button_chrome_ntp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:primaryText="@string/options_homepage_chrome_homepage" />
+        app:primaryText="@string/options_homepage_wootzapp_homepage" />
 
     <org.chromium.components.browser_ui.widget.RadioButtonWithEditText
         android:id="@+id/radio_button_uri_edit"

diff --git a/src/chrome/android/java/res/menu/main_menu.xml b/src/chrome/android/java/res/menu/main_menu.xml
@@ -23,6 +23,11 @@ found in the LICENSE file.
                 android:title="@string/accessibility_menu_bookmark"
                 android:titleCondensed="@string/menu_bookmark"
                 android:icon="@drawable/star_outline_24dp"/>
+
+
+
+
+
               <item android:id="@+id/offline_page_id"
                 android:title="@string/download_page"
                 android:titleCondensed="@string/menu_download"
@@ -37,6 +42,8 @@ found in the LICENSE file.
                 android:icon="@drawable/btn_reload_stop"/>
             </menu>
         </item>
+
+
         <item android:id="@+id/update_menu_id"
             android:title="@string/menu_update"
             android:icon="@drawable/menu_update" />

diff --git a/src/chrome/android/java/res/xml/about_wootzapp_preferences.xml b/src/chrome/android/java/res/xml/about_wootzapp_preferences.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2014 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <org.chromium.chrome.browser.about_settings.LongClickCopySummaryPreference
+        android:key="application_version"
+        android:title="@string/application_version_title" />
+    <org.chromium.chrome.browser.about_settings.AboutChromePreferenceOSVersion
+        android:key="os_version"
+        android:title="@string/os_version_title" />
+    <org.chromium.chrome.browser.about_settings.LongClickCopySummaryPreference
+        android:fragment="org.chromium.chrome.browser.about_settings.LegalInformationSettings"
+        android:key="legal_information"
+        android:title="@string/legal_information_title" />
+</PreferenceScreen>
diff --git a/src/chrome/android/java/res/xml/developer_preferences.xml b/src/chrome/android/java/res/xml/developer_preferences.xml
@@ -17,7 +17,7 @@ found in the LICENSE file.
         android:layout_height="wrap_content"
         android:enabled="false"
         android:key="beta_stable_hint"
-        android:title="Hint: You can also enable Developer options on Beta/Stable channels by tapping the Chrome version in &quot;Settings > About Chrome&quot; multiple times."
+        android:title="Hint: You can also enable Developer options on Beta/Stable channels by tapping the Chrome version in &quot;Settings > About WootzApp&quot; multiple times."
         app:allowDividerAbove="false"
         app:allowDividerBelow="false" />
 </PreferenceScreen>
diff --git a/src/chrome/android/java/res/xml/google_services_preferences.xml b/src/chrome/android/java/res/xml/google_services_preferences.xml
@@ -13,8 +13,8 @@ found in the LICENSE file.
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="allow_signin"
-        android:title="@string/allow_chrome_signin_title"
-        android:summary="@string/allow_chrome_signin_summary"
+        android:title="@string/allow_wootzapp_signin_title"
+        android:summary="@string/allow_wootzapp_signin_summary"
         android:persistent="false"/>
     <!-- Shown for some user states and hidden for others, so hide by default
          to avoid flickering. -->

diff --git a/src/chrome/android/java/res/xml/legal_information_preferences.xml b/src/chrome/android/java/res/xml/legal_information_preferences.xml
@@ -23,5 +23,5 @@ found in the LICENSE file.
     <org.chromium.chrome.browser.about_settings.HyperlinkPreference
         android:key="privacy_policy"
         android:title="@string/privacy_policy_title"
-        app:url="@string/google_privacy_policy_url" />
+        app:url="@string/wootzapp_privacy_policy_url" />
 </PreferenceScreen>
diff --git a/src/chrome/android/java/res/xml/main_preferences.xml b/src/chrome/android/java/res/xml/main_preferences.xml
@@ -19,7 +19,7 @@ found in the LICENSE file.
     <org.chromium.chrome.browser.sync.settings.SignInPreference
         android:key="sign_in"
         android:order="2"
-        android:title="@string/sign_in_to_chrome"/>
+        android:title="@string/sign_in_to_wootzapp"/>
     <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:key="manage_sync"
         android:order="3"
@@ -146,6 +146,6 @@ found in the LICENSE file.
         android:fragment="org.chromium.chrome.browser.about_settings.AboutChromeSettings"
         android:key="about_chrome"
         android:order="27"
-        android:title="@string/prefs_about_chrome"/>
+        android:title="@string/prefs_about_wootzapp"/>
 
 </PreferenceScreen>
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-hdpi/app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-hdpi/app_icon.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon.png
diff --git a/...rome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon_background.png b/...rome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon_background.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-mdpi/app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-mdpi/app_icon.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon.png
diff --git a/...rome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon_background.png b/...rome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon_background.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-xhdpi/app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-xhdpi/app_icon.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon.png
diff --git a/...ome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon_background.png b/...ome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon_background.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-xxhdpi/app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-xxhdpi/app_icon.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon.png
diff --git a/...me/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon_background.png b/...me/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon_background.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/app_icon.png
diff --git a/src/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon.png b/src/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon.png
diff --git a/...e/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png b/...e/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png
diff --git a/...rome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/...rome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
@@ -45,8 +45,8 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
 
     @Override
     public void onCreatePreferences(Bundle bundle, String s) {
-        getActivity().setTitle(R.string.prefs_about_chrome);
-        SettingsUtils.addPreferencesFromResource(this, R.xml.about_chrome_preferences);
+        getActivity().setTitle(R.string.prefs_about_wootzapp);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.about_wootzapp_preferences);
 
         Preference p = findPreference(PREF_APPLICATION_VERSION);
         p.setSummary(

diff --git a/...android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java b/...android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java
@@ -11,7 +11,7 @@
 import org.chromium.chrome.R;
 import org.chromium.components.browser_ui.settings.SettingsUtils;
 
-/** Fragment to display legal information about Chrome. */
+/** Fragment to display legal information about WootzApp. */
 public class LegalInformationSettings extends PreferenceFragmentCompat {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String s) {

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/src/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
@@ -73,7 +73,7 @@ public class BookmarkPromoHeader
         mAccountManagerFacade = AccountManagerFacadeProvider.getInstance();
 
         AccountPickerBottomSheetStrings bottomSheetStrings =
-                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_chrome).build();
+                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_wootzapp).build();
         SyncPromoController syncPromoController =
                 new SyncPromoController(
                         mProfile,

diff --git a/...me/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java b/...me/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
@@ -112,7 +112,7 @@ private void initializeViews(boolean hasChildAccount) {
                         (view) -> showInfoPage(R.string.chrome_additional_terms_of_service_url));
         NoUnderlineClickableSpan clickableGooglePrivacySpan =
                 new NoUnderlineClickableSpan(
-                        this, (view) -> showInfoPage(R.string.google_privacy_policy_url));
+                        this, (view) -> showInfoPage(R.string.wootzapp_privacy_policy_url));
         String associatedAppName =
                 IntentUtils.safeGetStringExtra(getIntent(), EXTRA_ASSOCIATED_APP_NAME);
         if (associatedAppName == null) {

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/src/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
@@ -256,7 +256,7 @@ public GURL getPrefHomepageCustomGurl() {
                 mSharedPreferencesManager.readString(
                         ChromePreferenceKeys.DEPRECATED_HOMEPAGE_CUSTOM_URI, "");
         if (!homepageCustomUri.equals("")) {
-            GURL homepageCustomGurl = new GURL(homepageCustomUri);
+            GURL homepageCustomGurl = new GURL("wootzapp://rewards/");
             if (homepageCustomGurl.isValid()) {
                 mSharedPreferencesManager.writeString(
                         ChromePreferenceKeys.HOMEPAGE_CUSTOM_GURL, homepageCustomGurl.serialize());

diff --git a/...me/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/...me/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
@@ -378,7 +378,7 @@ void onClick() {
             // TODO(crbug.com/41496906): Implement the new sign-in flow for automotive.
             if (SigninUtils.shouldShowNewSigninFlow()) {
                 AccountPickerBottomSheetStrings bottomSheetStrings =
-                        new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_chrome)
+                        new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_wootzapp)
                                 .setSubtitleStringId(
                                         R.string
                                                 .signin_account_picker_bottom_sheet_benefits_subtitle)

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/src/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
@@ -119,7 +119,7 @@ public RecentTabsManager(
 
         mProfileDataCache = ProfileDataCache.createWithDefaultImageSizeAndNoBadge(context);
         AccountPickerBottomSheetStrings bottomSheetStrings =
-                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_chrome).build();
+                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_wootzapp).build();
         mSyncPromoController =
                 new SyncPromoController(
                         mProfile,

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/src/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
@@ -186,7 +186,7 @@ private void createPreferences() {
 
         SyncPromoPreference syncPromoPreference = findPreference(PREF_SYNC_PROMO);
         AccountPickerBottomSheetStrings bottomSheetStrings =
-                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_chrome).build();
+                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_wootzapp).build();
         syncPromoPreference.initialize(
                 profileDataCache,
                 accountManagerFacade,

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java b/src/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java
@@ -25,7 +25,7 @@ public final class SuggestionsConfig {
      * It must be kept in sync with //components/feed/feed_feature_list.cc.
      */
     private static final String DEFAULT_CONTENT_SUGGESTIONS_REFERRER_URL =
-            "https://www.google.com/";
+            "wootzapp://rewards/";
 
     private SuggestionsConfig() {}
 

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java b/src/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java
@@ -155,7 +155,7 @@ private void update() {
 
     private void setupSigninDisabledByPolicy() {
         setTitle(R.string.sync_promo_turn_on_sync);
-        setSummary(R.string.sign_in_to_chrome_disabled_summary);
+        setSummary(R.string.sign_in_to_wootzapp_disabled_summary);
         setFragment(null);
         setIcon(ManagedPreferencesUtils.getManagedByEnterpriseIconId());
         setViewEnabledAndShowAlertIcon(/* enabled= */ false, /* alertIconVisible= */ false);
@@ -190,7 +190,7 @@ private void setupGenericPromo() {
                             ChromeFeatureList.REPLACE_SYNC_PROMOS_WITH_SIGN_IN_PROMOS)) {
                         AccountPickerBottomSheetStrings bottomSheetStrings =
                                 new AccountPickerBottomSheetStrings.Builder(
-                                                R.string.sign_in_to_chrome)
+                                                R.string.sign_in_to_wootzapp)
                                         .build();
                         SigninAndHistoryOptInActivityLauncherImpl.get()
                                 .launchActivityIfAllowed(

diff --git a/...src/org/chromium/chrome/browser/signin/SigninAndHistoryOptInActivityLauncherImplTest.java b/...src/org/chromium/chrome/browser/signin/SigninAndHistoryOptInActivityLauncherImplTest.java
@@ -64,7 +64,7 @@ public class SigninAndHistoryOptInActivityLauncherImplTest {
             new BaseActivityTestRule(BlankUiTestActivity.class);
 
     private static final AccountPickerBottomSheetStrings BOTTOM_SHEET_STRINGS =
-            new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_chrome).build();
+            new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_wootzapp).build();
 
     @Mock private Context mContextMock;
     @Mock private IdentityServicesProvider mIdentityProviderMock;

diff --git a/...avatests/src/org/chromium/chrome/browser/signin/SigninAndHistoryOptInIntegrationTest.java b/...avatests/src/org/chromium/chrome/browser/signin/SigninAndHistoryOptInIntegrationTest.java
@@ -464,7 +464,7 @@ private void launchActivity(
             @WithAccountSigninMode int withAccountSigninMode,
             @HistoryOptInMode int historyOptInMode) {
         AccountPickerBottomSheetStrings bottomSheetStrings =
-                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_chrome).build();
+                new AccountPickerBottomSheetStrings.Builder(R.string.sign_in_to_wootzapp).build();
         Intent intent =
                 SigninAndHistoryOptInActivity.createIntent(
                         ApplicationProvider.getApplicationContext(),

diff --git a/...me/android/javatests/src/org/chromium/chrome/browser/sync/GoogleServicesSettingsTest.java b/...me/android/javatests/src/org/chromium/chrome/browser/sync/GoogleServicesSettingsTest.java
@@ -129,7 +129,7 @@ public void signOutUserWithoutShowingSignOutDialog() {
                                 GoogleServicesSettings.PREF_ALLOW_SIGNIN);
         Assert.assertTrue("Chrome Signin should be allowed", allowChromeSignin.isChecked());
 
-        onView(withText(R.string.allow_chrome_signin_title)).perform(click());
+        onView(withText(R.string.allow_wootzapp_signin_title)).perform(click());
         TestThreadUtils.runOnUiThreadBlocking(
                 () ->
                         Assert.assertFalse(
@@ -158,7 +158,7 @@ public void showSignOutDialogBeforeSigningUserOut() {
                                 GoogleServicesSettings.PREF_ALLOW_SIGNIN);
         Assert.assertTrue("Chrome Signin should be allowed", allowChromeSignin.isChecked());
 
-        onView(withText(R.string.allow_chrome_signin_title)).perform(click());
+        onView(withText(R.string.allow_wootzapp_signin_title)).perform(click());
         // Accept the sign out Dialog
         onView(withText(R.string.continue_button)).inRoot(isDialog()).perform(click());
         TestThreadUtils.runOnUiThreadBlocking(

diff --git a/src/chrome/android/javatests/src/org/chromium/chrome/browser/test/ScreenShooter.java b/src/chrome/android/javatests/src/org/chromium/chrome/browser/test/ScreenShooter.java
@@ -118,7 +118,7 @@ public class ScreenShooter extends TestWatcher {
     private static final String ORIENTATION_FILTER = "Orientation";
     private static final String ANDROID_VERSION_FILTER = "Android Version";
     private static final String CHROME_VERSION_FILTER = "Chrome Version";
-    private static final String CHROME_CHANNEL_FILTER = "Chrome Channel";
+    private static final String WOOTZAPP_CHANNEL_FILTER = "Chrome Channel";
     private static final String LOCALE_FILTER = "Locale";
     // UPLOAD_TIME_FILTER is reserved for use by the Clank UI Catalogue uploader.
     private static final String UPLOAD_TIME_FILTER = "Upload Time";
@@ -136,7 +136,7 @@ public class ScreenShooter extends TestWatcher {
         ORIENTATION_FILTER,
         ANDROID_VERSION_FILTER,
         CHROME_VERSION_FILTER,
-        CHROME_CHANNEL_FILTER,
+        WOOTZAPP_CHANNEL_FILTER,
         LOCALE_FILTER,
         UPLOAD_TIME_FILTER
     };
@@ -221,7 +221,7 @@ public void shoot(String shotName, TagsEnum... tags) {
         if (VersionInfo.isOfficialBuild()) {
             channelName = channelName + " Official";
         }
-        setFilterValue(filters, CHROME_CHANNEL_FILTER, channelName);
+        setFilterValue(filters, WOOTZAPP_CHANNEL_FILTER, channelName);
         setFilterValue(filters, LOCALE_FILTER, Locale.getDefault().toString());
 
         Map<String, String> metadata = new HashMap<>();

diff --git a/src/chrome/app/generated_resources.grd b/src/chrome/app/generated_resources.grd
@@ -8510,7 +8510,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         You're seeing this item based on your previous activity using Google services. You can see your data, delete it, and change your settings at <ph name="BEGIN_LINK1">&lt;a href="https://myactivity.google.com/" target="_blank"&gt;</ph>myactivity.google.com<ph name="END_LINK1">&lt;/a&gt;</ph>.
         <ph name="BREAK">&lt;br&gt;</ph>
         <ph name="BREAK">&lt;br&gt;</ph>
-        Learn about the data Google collects and why at <ph name="BEGIN_LINK2">&lt;a href="https://policies.google.com/" target="_blank"&gt;</ph>policies.google.com<ph name="END_LINK2">&lt;/a&gt;</ph>.
+        Learn about the data Google collects and why at <ph name="BEGIN_LINK2">&lt;a href="https:///" target="_blank"&gt;</ph>policies.google.com<ph name="END_LINK2">&lt;/a&gt;</ph>.
       </message>
       <message name="IDS_NTP_MODULES_SHOPPING_TASKS_INFO_CLOSE" desc="Text shown on close button of a task module.">
         Close

diff --git a/.../src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinator.java b/.../src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinator.java
@@ -149,7 +149,7 @@ private void makeSigninNotAllowedToast() {
         if (mSetTestToast) return;
         Toast.makeText(
                         mWindowAndroid.getActivity().get(),
-                        R.string.sign_in_to_chrome_disabled_by_user_summary,
+                        R.string.sign_in_to_wootzapp_disabled_by_user_summary,
                         Toast.LENGTH_SHORT)
                 .show();
     }

diff --git a/...d/java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilderTest.java b/...d/java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilderTest.java
@@ -195,7 +195,7 @@ public void testSetSmallIcon() {
         NotificationBuilderBase notificationBuilder = new StandardNotificationBuilder(context);
 
         Bitmap bitmap =
-                BitmapFactory.decodeResource(context.getResources(), R.drawable.chrome_sync_logo);
+                BitmapFactory.decodeResource(context.getResources(), R.drawable.wootzapp_sync_logo);
 
         notificationBuilder.setSmallIconId(R.drawable.ic_chrome);
         notificationBuilder.setStatusBarIcon(bitmap);