diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py index 8c7d6b9..44f18532 100755 --- a/build/vs_toolchain.py +++ b/build/vs_toolchain.py
@@ -22,7 +22,7 @@ # Use MSVS2015 as the default toolchain. -CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2015' +CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2017' def SetEnvironmentAndGetRuntimeDllDirs():
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index e94aab1..6fe000c6 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn
@@ -1430,12 +1430,8 @@ if (is_chrome_branded) { sources += [ - "//chrome/app/theme/$branding_path_component/win/tiles/LogoBeta.png", "//chrome/app/theme/$branding_path_component/win/tiles/LogoCanary.png", - "//chrome/app/theme/$branding_path_component/win/tiles/LogoDev.png", - "//chrome/app/theme/$branding_path_component/win/tiles/SmallLogoBeta.png", "//chrome/app/theme/$branding_path_component/win/tiles/SmallLogoCanary.png", - "//chrome/app/theme/$branding_path_component/win/tiles/SmallLogoDev.png", ] }
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 067e5a41..fa5e7e4 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc
@@ -167,8 +167,6 @@ #if defined(GOOGLE_CHROME_BUILD) IDR_MAINFRAME ICON "theme\google_chrome\win\chrome.ico" IDR_SXS ICON "theme\google_chrome\win\chrome_sxs.ico" -IDR_X004_DEV ICON "theme\google_chrome\win\chrome_dev.ico" -IDR_X005_BETA ICON "theme\google_chrome\win\chrome_beta.ico" #else IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico" #endif
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index 2622328..7e8b860 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// clang-format off - #define IDR_MAINFRAME 101 #define IDI_THROBBER_01 102 @@ -31,9 +29,5 @@ #define IDI_THROBBER_23 124 #define IDI_THROBBER_24 125 #define IDR_SXS 126 -#define IDR_X004_DEV 127 -#define IDR_X005_BETA 128 - -// clang-format on // Values around 1600 are used by installer/setup/build/
diff --git a/chrome/app/chrome_exe.rc b/chrome/app/chrome_exe.rc index 4c6be18..d055458d 100644 --- a/chrome/app/chrome_exe.rc +++ b/chrome/app/chrome_exe.rc
@@ -36,17 +36,17 @@ // icons. To avoid breaking existing shortcuts, add new icons at the end // (following the ordering described above). #if defined(GOOGLE_CHROME_BUILD) -IDR_MAINFRAME ICON "theme\\google_chrome\\win\\chrome.ico" +IDR_MAINFRAME ICON "theme\\google_chrome\\win\\chrome.ico" // These three are no longer used, but remain as placeholders. (They cannot be // removed, or existing shortcuts to the later resources will break.) -IDR_MAINFRAME_2 ICON "theme\\google_chrome\\win\\placeholder.ico" -IDR_MAINFRAME_3 ICON "theme\\google_chrome\\win\\placeholder.ico" -IDR_MAINFRAME_4 ICON "theme\\google_chrome\\win\\placeholder.ico" +IDR_MAINFRAME_2 ICON "theme\\google_chrome\\win\\placeholder.ico" +IDR_MAINFRAME_3 ICON "theme\\google_chrome\\win\\placeholder.ico" +IDR_MAINFRAME_4 ICON "theme\\google_chrome\\win\\placeholder.ico" // The SXS icon must have an index of 4, the constant is used in Chrome code to // identify it. -IDR_SXS ICON "theme\\google_chrome\\win\\chrome_sxs.ico" +IDR_SXS ICON "theme\\google_chrome\\win\\chrome_sxs.ico" #else -IDR_MAINFRAME ICON "theme\\chromium\\win\\chromium.ico" +IDR_MAINFRAME ICON "theme\\chromium\\win\\chromium.ico" #endif // Start a naming scheme to keep icons in order. A leading X is used to keep @@ -55,14 +55,12 @@ // chrome_icon_resources_win.h should also be updated. #if defined(GOOGLE_CHROME_BUILD) -IDR_X001_APP_LIST ICON "theme\\google_chrome\\win\\app_list.ico" -IDR_X002_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_list_sxs.ico" -IDR_X003_INCOGNITO ICON "theme\\google_chrome\\win\\incognito.ico" -IDR_X004_DEV ICON "theme\\google_chrome\\win\\chrome_dev.ico" -IDR_X005_BETA ICON "theme\\google_chrome\\win\\chrome_beta.ico" +IDR_X001_APP_LIST ICON "theme\\google_chrome\\win\\app_list.ico" +IDR_X002_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_list_sxs.ico" +IDR_X003_INCOGNITO ICON "theme\\google_chrome\\win\\incognito.ico" #else -IDR_X001_APP_LIST ICON "theme\\chromium\\win\\app_list.ico" -IDR_X003_INCOGNITO ICON "theme\\chromium\\win\\incognito.ico" +IDR_X001_APP_LIST ICON "theme\\chromium\\win\\app_list.ico" +IDR_X003_INCOGNITO ICON "theme\\chromium\\win\\incognito.ico" #endif
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 594c0ca..cadacb5 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd
@@ -136,11 +136,8 @@ Chromium </message> <if expr="is_win"> - <message name="IDS_SXS_SHORTCUT_NAME" desc="Unused in Chromium builds" translateable="false"> - </message> - <message name="IDS_SHORTCUT_NAME_BETA" desc="Unused in Chromium builds" translateable="false"> - </message> - <message name="IDS_SHORTCUT_NAME_DEV" desc="Unused in Chromium builds" translateable="false"> + <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name for SxS channel"> + Chromium </message> <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description"> Chromium is a web browser that runs webpages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Chromium. @@ -862,12 +859,6 @@ <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Chrome Apps Start Menu folder name."> Chromium Apps </message> - <if expr="is_win"> - <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_BETA" desc="Unused in Chromium builds" translateable="false"> - </message> - <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_DEV" desc="Unused in Chromium builds" translateable="false"> - </message> - </if> <!-- Chrome Conflicts bubble --> <if expr="is_win"> @@ -1006,20 +997,14 @@ <message name="IDS_INBOUND_MDNS_RULE_NAME" desc="The name of the firewall rule allowing inbound mDNS traffic."> Chromium (mDNS-In) </message> - <message name="IDS_INBOUND_MDNS_RULE_NAME_BETA" desc="Unused in Chromium builds" translateable="false"> - </message> - <message name="IDS_INBOUND_MDNS_RULE_NAME_CANARY" desc="Unused in Chromium builds" translateable="false"> - </message> - <message name="IDS_INBOUND_MDNS_RULE_NAME_DEV" desc="Unused in Chromium builds" translateable="false"> + <message name="IDS_INBOUND_MDNS_RULE_NAME_CANARY" desc="The name of the firewall rule allowing inbound mDNS traffic for canary."> + Chromium (mDNS-In) </message> <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION" desc="The description of the firewall rule allowing inbound mDNS traffic."> Inbound rule for Chromium to allow mDNS traffic. </message> - <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_BETA" desc="Unused in Chromium builds" translateable="false"> - </message> - <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY" desc="Unused in Chromium builds" translateable="false"> - </message> - <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_DEV" desc="Unused in Chromium builds" translateable="false"> + <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY" desc="The description of the firewall rule allowing inbound mDNS traffic canary."> + Inbound rule for Chromium to allow mDNS traffic. </message> </if>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 9f9bed9..47c37c66 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd
@@ -138,15 +138,9 @@ Chrome </message> <if expr="is_win"> - <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome shortcut name for canary channel"> + <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name for SxS channel"> Google Chrome Canary </message> - <message name="IDS_SHORTCUT_NAME_BETA" desc="The Chrome shortcut name for beta channel"> - Google Chrome Beta - </message> - <message name="IDS_SHORTCUT_NAME_DEV" desc="The Chrome shortcut name for dev channel"> - Google Chrome Dev - </message> <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description"> Google Chrome is a web browser that runs webpages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Google Chrome. </message> @@ -866,14 +860,6 @@ <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Chrome Apps Start Menu folder name for the Canary channel."> Chrome Canary Apps </message> - <if expr="is_win"> - <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_BETA" desc="Name for the Chrome Apps Start Menu folder name for the Beta channel."> - Chrome Beta Apps - </message> - <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_DEV" desc="Name for the Chrome Apps Start Menu folder name for the Dev channel."> - Chrome Dev Apps - </message> - </if> <!-- Chrome Conflicts bubble --> <if expr="is_win"> @@ -1012,27 +998,15 @@ <message name="IDS_INBOUND_MDNS_RULE_NAME" desc="The name of the firewall rule allowing inbound mDNS traffic."> Google Chrome (mDNS-In) </message> - <message name="IDS_INBOUND_MDNS_RULE_NAME_BETA" desc="The name of the firewall rule allowing inbound mDNS traffic for beta."> - Google Chrome Beta (mDNS-In) - </message> <message name="IDS_INBOUND_MDNS_RULE_NAME_CANARY" desc="The name of the firewall rule allowing inbound mDNS traffic for canary."> Google Chrome Canary (mDNS-In) </message> - <message name="IDS_INBOUND_MDNS_RULE_NAME_DEV" desc="The name of the firewall rule allowing inbound mDNS traffic for dev."> - Google Chrome Dev (mDNS-In) - </message> <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION" desc="The description of the firewall rule allowing inbound mDNS traffic."> Inbound rule for Google Chrome to allow mDNS traffic. </message> - <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_BETA" desc="The description of the firewall rule allowing inbound mDNS traffic beta."> - Inbound rule for Google Chrome Beta to allow mDNS traffic. - </message> <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY" desc="The description of the firewall rule allowing inbound mDNS traffic canary."> Inbound rule for Google Chrome Canary to allow mDNS traffic. </message> - <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_DEV" desc="The description of the firewall rule allowing inbound mDNS traffic dev."> - Inbound rule for Google Chrome Dev to allow mDNS traffic. - </message> </if> <if expr="not is_android">
diff --git a/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.cc index fe0fe54..51a8e9eb73 100644 --- a/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.cc +++ b/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <memory> #include <utility> #include "chrome/browser/browser_process.h" @@ -250,11 +251,19 @@ num_cache_resources_(0), num_network_resources_(0), cache_bytes_(0), - network_bytes_(0) {} + network_bytes_(0), + redirect_chain_size_(0) {} CorePageLoadMetricsObserver::~CorePageLoadMetricsObserver() {} page_load_metrics::PageLoadMetricsObserver::ObservePolicy +CorePageLoadMetricsObserver::OnRedirect( + content::NavigationHandle* navigation_handle) { + redirect_chain_size_++; + return CONTINUE_OBSERVING; +} + +page_load_metrics::PageLoadMetricsObserver::ObservePolicy CorePageLoadMetricsObserver::OnCommit( content::NavigationHandle* navigation_handle) { transition_ = navigation_handle->GetPageTransition(); @@ -264,6 +273,8 @@ was_no_store_main_resource_ = headers->HasHeaderValue("cache-control", "no-store"); } + UMA_HISTOGRAM_COUNTS_100("PageLoad.Navigation.RedirectChainLength", + redirect_chain_size_); return CONTINUE_OBSERVING; }
diff --git a/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.h index 5147e51..c5ec9670 100644 --- a/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.h +++ b/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.h
@@ -91,6 +91,8 @@ ~CorePageLoadMetricsObserver() override; // page_load_metrics::PageLoadMetricsObserver: + ObservePolicy OnRedirect( + content::NavigationHandle* navigation_handle) override; ObservePolicy OnCommit(content::NavigationHandle* navigation_handle) override; void OnDomContentLoadedEventStart( const page_load_metrics::PageLoadTiming& timing, @@ -161,6 +163,9 @@ int64_t cache_bytes_; int64_t network_bytes_; + // Size of the redirect chain, which excludes the first URL. + int redirect_chain_size_; + // True if we've received a non-scroll input (touch tap or mouse up) // after first paint has happened. bool received_non_scroll_input_after_first_paint_ = false;
diff --git a/chrome/common/chrome_icon_resources_win.h b/chrome/common/chrome_icon_resources_win.h index 9400c0b2..dc18f5a1 100644 --- a/chrome/common/chrome_icon_resources_win.h +++ b/chrome/common/chrome_icon_resources_win.h
@@ -30,12 +30,6 @@ // The Chrome incognito icon. kIncognitoIndex = 7, - - // The Chrome Dev application icon. - kDevApplicationIndex = 8, - - // The Chrome Beta application icon. - kBetaApplicationIndex = 9, #else // defined(GOOGLE_CHROME_BUILD) // The Chromium App Launcher icon. kAppLauncherIndex = 1,
diff --git a/chrome/install_static/google_chrome_install_modes.cc b/chrome/install_static/google_chrome_install_modes.cc index 53ffdd17..4202e85 100644 --- a/chrome/install_static/google_chrome_install_modes.cc +++ b/chrome/install_static/google_chrome_install_modes.cc
@@ -47,52 +47,6 @@ icon_resources::kApplicationIndex, // App icon resource index. IDR_MAINFRAME, // App icon resource id. }, - // A secondary install mode for Google Chrome Beta - { - sizeof(kInstallModes[0]), - BETA_INDEX, // The mode for the side-by-side beta channel. - "chrome-beta", // Install switch. - L" Beta", // Install suffix. - L"Beta", // Logo suffix. - L"{8237E44A-0054-442C-B6B6-EA0509993955}", // A distinct app GUID. - L"Google Chrome Beta", // A distinct base_app_name. - L"ChromeBeta", // A distinct base_app_id. - L"ChromeBHTML", // ProgID prefix. - L"Chrome Beta HTML Document", // ProgID description. - L"{8237E44A-0054-442C-B6B6-EA0509993955}", // Active Setup GUID. - L"", // CommandExecuteImpl CLSID. - L"beta", // Forced channel name. - ChannelStrategy::FIXED, - true, // Supports system-level installs. - false, // Does not support in-product set as default browser UX. - true, // Supports retention experiments. - false, // Did not support multi-install. - icon_resources::kBetaApplicationIndex, // App icon resource index. - IDR_X005_BETA, // App icon resource id. - }, - // A secondary install mode for Google Chrome Dev - { - sizeof(kInstallModes[0]), - DEV_INDEX, // The mode for the side-by-side dev channel. - "chrome-dev", // Install switch. - L" Dev", // Install suffix. - L"Dev", // Logo suffix. - L"{401C381F-E0DE-4B85-8BD8-3F3F14FBDA57}", // A distinct app GUID. - L"Google Chrome Dev", // A distinct base_app_name. - L"ChromeDev", // A distinct base_app_id. - L"ChromeDHTML", // ProgID prefix. - L"Chrome Dev HTML Document", // ProgID description. - L"{401C381F-E0DE-4B85-8BD8-3F3F14FBDA57}", // Active Setup GUID. - L"", // CommandExecuteImpl CLSID. - L"dev", // Forced channel name. - ChannelStrategy::FIXED, - true, // Supports system-level installs. - false, // Does not support in-product set as default browser UX. - true, // Supports retention experiments. - false, // Did not support multi-install. - icon_resources::kDevApplicationIndex, // App icon resource index. - IDR_X004_DEV, // App icon resource id. - }, // A secondary install mode for Google Chrome SxS (canary). { sizeof(kInstallModes[0]),
diff --git a/chrome/install_static/google_chrome_install_modes.h b/chrome/install_static/google_chrome_install_modes.h index 66838c3b..700a132 100644 --- a/chrome/install_static/google_chrome_install_modes.h +++ b/chrome/install_static/google_chrome_install_modes.h
@@ -17,8 +17,6 @@ // resource strings in chrome/installer/util/prebuild/create_string_rc. enum InstallConstantIndex { STABLE_INDEX, - BETA_INDEX, - DEV_INDEX, CANARY_INDEX, NUM_INSTALL_MODES, };
diff --git a/chrome/install_static/install_util_unittest.cc b/chrome/install_static/install_util_unittest.cc index 9d60d63..1ebd91a 100644 --- a/chrome/install_static/install_util_unittest.cc +++ b/chrome/install_static/install_util_unittest.cc
@@ -348,8 +348,7 @@ // The directory strings for the brand's install modes; parallel to // kInstallModes. static constexpr const wchar_t* kInstallDirs[] = { - L"Google\\Chrome", L"Google\\Chrome Beta", L"Google\\Chrome Dev", - L"Google\\Chrome SxS", + L"Google\\Chrome", L"Google\\Chrome SxS", }; #else // The directory strings for the brand's install modes; parallel to @@ -369,8 +368,7 @@ // The registry path strings for the brand's install modes; parallel to // kInstallModes. static constexpr const wchar_t* kRegistryPaths[] = { - L"Software\\Google\\Chrome", L"Software\\Google\\Chrome Beta", - L"Software\\Google\\Chrome Dev", L"Software\\Google\\Chrome SxS", + L"Software\\Google\\Chrome", L"Software\\Google\\Chrome SxS", }; #else // The registry path strings for the brand's install modes; parallel to @@ -392,10 +390,6 @@ static constexpr const wchar_t* kUninstallRegistryPaths[] = { L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome", L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" // (cont'd) - L"Google Chrome Beta", - L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" // (cont'd) - L"Google Chrome Dev", - L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" // (cont'd) L"Google Chrome SxS", }; #else @@ -423,8 +417,6 @@ // The app guids for the brand's install modes; parallel to kInstallModes. static constexpr const wchar_t* kAppGuids[] = { L"{8A69D345-D564-463c-AFF1-A69D9E530F96}", // Google Chrome. - L"{8237E44A-0054-442C-B6B6-EA0509993955}", // Google Chrome Beta. - L"{401C381F-E0DE-4B85-8BD8-3F3F14FBDA57}", // Google Chrome Dev. L"{4EA16AC7-FD5A-47C3-875B-DBF4A2008C20}", // Google Chrome SxS (Canary). }; static_assert(arraysize(kAppGuids) == NUM_INSTALL_MODES, @@ -439,7 +431,7 @@ #if defined(GOOGLE_CHROME_BUILD) // The base app ids for the brand's install modes; parallel to kInstallModes. static constexpr const wchar_t* kBaseAppIds[] = { - L"Chrome", L"ChromeBeta", L"ChromeDev", L"ChromeCanary", + L"Chrome", L"ChromeCanary", }; #else // The base app ids for the brand's install modes; parallel to kInstallModes. @@ -521,16 +513,6 @@ InstallStaticUtilTest, testing::Combine(testing::Values(STABLE_INDEX), testing::Values("user", "system"))); -// Beta supports user and system levels. -INSTANTIATE_TEST_CASE_P(Beta, - InstallStaticUtilTest, - testing::Combine(testing::Values(BETA_INDEX), - testing::Values("user", "system"))); -// Dev supports user and system levels. -INSTANTIATE_TEST_CASE_P(Dev, - InstallStaticUtilTest, - testing::Combine(testing::Values(DEV_INDEX), - testing::Values("user", "system"))); // Canary is only at user level. INSTANTIATE_TEST_CASE_P(Canary, InstallStaticUtilTest,
diff --git a/chrome/install_static/product_install_details_unittest.cc b/chrome/install_static/product_install_details_unittest.cc index 57d33bb..582921d 100644 --- a/chrome/install_static/product_install_details_unittest.cc +++ b/chrome/install_static/product_install_details_unittest.cc
@@ -140,25 +140,6 @@ STABLE_INDEX, false, L"", }, { - L"C:\\Program Files (x86)\\Google\\Chrome " - L"Beta\\Application\\chrome.exe", - BETA_INDEX, true, L"beta", - }, - { - L"C:\\Users\\user\\AppData\\Local\\Google\\Chrome Beta\\Application" - L"\\chrome.exe", - BETA_INDEX, false, L"beta", - }, - { - L"C:\\Program Files (x86)\\Google\\Chrome Dev\\Application\\chrome.exe", - DEV_INDEX, true, L"dev", - }, - { - L"C:\\Users\\user\\AppData\\Local\\Google\\Chrome Dev\\Application" - L"\\chrome.exe", - DEV_INDEX, false, L"dev", - }, - { L"C:\\Users\\user\\AppData\\Local\\Google\\Chrome SxS\\Application" L"\\chrome.exe", CANARY_INDEX, false, L"canary",
diff --git a/chrome/installer/mini_installer/appid.h b/chrome/installer/mini_installer/appid.h index c408242..ef74c742 100644 --- a/chrome/installer/mini_installer/appid.h +++ b/chrome/installer/mini_installer/appid.h
@@ -7,16 +7,9 @@ // The appid included by the mini_installer. namespace google_update { - extern const wchar_t kAppGuid[]; -extern const wchar_t kMultiInstallAppGuid[]; - -#if defined(GOOGLE_CHROME_BUILD) -extern const wchar_t kBetaAppGuid[]; -extern const wchar_t kDevAppGuid[]; extern const wchar_t kSxSAppGuid[]; -#endif // defined(GOOGLE_CHROME_BUILD) - -} // namespace google_update +extern const wchar_t kMultiInstallAppGuid[]; +} #endif // CHROME_INSTALLER_MINI_INSTALLER_APPID_H_
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index c66d6dc..e29974a6 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release
@@ -52,13 +52,9 @@ # VisualElementsManifest.xml is based on the existence of # %(VersionDir)\VisualElements. Logo.png: %(VersionDir)s\VisualElements\ -LogoBeta.png: %(VersionDir)s\VisualElements\ LogoCanary.png: %(VersionDir)s\VisualElements\ -LogoDev.png: %(VersionDir)s\VisualElements\ SmallLogo.png: %(VersionDir)s\VisualElements\ -SmallLogoBeta.png: %(VersionDir)s\VisualElements\ SmallLogoCanary.png: %(VersionDir)s\VisualElements\ -SmallLogoDev.png: %(VersionDir)s\VisualElements\ # # SwiftShader sub-dir
diff --git a/chrome/installer/mini_installer/chrome_appid.cc b/chrome/installer/mini_installer/chrome_appid.cc index 19a64d8..34d3134 100644 --- a/chrome/installer/mini_installer/chrome_appid.cc +++ b/chrome/installer/mini_installer/chrome_appid.cc
@@ -10,12 +10,11 @@ const wchar_t kAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; const wchar_t kMultiInstallAppGuid[] = L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}"; -const wchar_t kBetaAppGuid[] = L"{8237E44A-0054-442C-B6B6-EA0509993955}"; -const wchar_t kDevAppGuid[] = L"{401C381F-E0DE-4B85-8BD8-3F3F14FBDA57}"; const wchar_t kSxSAppGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}"; -#else // defined(GOOGLE_CHROME_BUILD) +#else const wchar_t kAppGuid[] = L""; const wchar_t kMultiInstallAppGuid[] = L""; -#endif // defined(GOOGLE_CHROME_BUILD) +const wchar_t kSxSAppGuid[] = L""; +#endif } // namespace google_update
diff --git a/chrome/installer/mini_installer/configuration.cc b/chrome/installer/mini_installer/configuration.cc index 0a6163d..ec7c96d 100644 --- a/chrome/installer/mini_installer/configuration.cc +++ b/chrome/installer/mini_installer/configuration.cc
@@ -75,10 +75,6 @@ if (0 == ::lstrcmpi(args_[i], L"--system-level")) is_system_level_ = true; #if defined(GOOGLE_CHROME_BUILD) - else if (0 == ::lstrcmpi(args_[i], L"--chrome-beta")) - chrome_app_guid_ = google_update::kBetaAppGuid; - else if (0 == ::lstrcmpi(args_[i], L"--chrome-dev")) - chrome_app_guid_ = google_update::kDevAppGuid; else if (0 == ::lstrcmpi(args_[i], L"--chrome-sxs")) chrome_app_guid_ = google_update::kSxSAppGuid; #endif
diff --git a/chrome/installer/mini_installer/configuration_test.cc b/chrome/installer/mini_installer/configuration_test.cc index 75be478..b1f3400 100644 --- a/chrome/installer/mini_installer/configuration_test.cc +++ b/chrome/installer/mini_installer/configuration_test.cc
@@ -178,10 +178,6 @@ TEST_F(MiniInstallerConfigurationTest, ChromeAppGuid) { EXPECT_STREQ(google_update::kAppGuid, TestConfiguration(L"spam.exe").chrome_app_guid()); - EXPECT_STREQ(google_update::kBetaAppGuid, - TestConfiguration(L"spam.exe --chrome-beta").chrome_app_guid()); - EXPECT_STREQ(google_update::kDevAppGuid, - TestConfiguration(L"spam.exe --chrome-dev").chrome_app_guid()); EXPECT_STREQ(google_update::kSxSAppGuid, TestConfiguration(L"spam.exe --chrome-sxs").chrome_app_guid()); }
diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc index da1e76e..c26980a 100644 --- a/chrome/installer/setup/install_unittest.cc +++ b/chrome/installer/setup/install_unittest.cc
@@ -102,28 +102,6 @@ "</Application>\r\n"; #if defined(GOOGLE_CHROME_BUILD) -constexpr char kExpectedBetaManifest[] = - "<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\r\n" - " <VisualElements\r\n" - " ShowNameOnSquare150x150Logo='on'\r\n" - " Square150x150Logo='0.0.0.0\\VisualElements\\LogoBeta.png'\r\n" - " Square70x70Logo='0.0.0.0\\VisualElements\\SmallLogoBeta.png'\r\n" - " Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogoBeta.png'\r\n" - " ForegroundText='light'\r\n" - " BackgroundColor='#212121'/>\r\n" - "</Application>\r\n"; - -constexpr char kExpectedDevManifest[] = - "<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\r\n" - " <VisualElements\r\n" - " ShowNameOnSquare150x150Logo='on'\r\n" - " Square150x150Logo='0.0.0.0\\VisualElements\\LogoDev.png'\r\n" - " Square70x70Logo='0.0.0.0\\VisualElements\\SmallLogoDev.png'\r\n" - " Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogoDev.png'\r\n" - " ForegroundText='light'\r\n" - " BackgroundColor='#212121'/>\r\n" - "</Application>\r\n"; - constexpr char kExpectedCanaryManifest[] = "<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\r\n" " <VisualElements\r\n" @@ -141,16 +119,6 @@ testing::Combine(testing::Values(install_static::STABLE_INDEX), testing::Values(kExpectedPrimaryManifest))); INSTANTIATE_TEST_CASE_P( - BetaChrome, - CreateVisualElementsManifestTest, - testing::Combine(testing::Values(install_static::BETA_INDEX), - testing::Values(kExpectedBetaManifest))); -INSTANTIATE_TEST_CASE_P( - DevChrome, - CreateVisualElementsManifestTest, - testing::Combine(testing::Values(install_static::DEV_INDEX), - testing::Values(kExpectedDevManifest))); -INSTANTIATE_TEST_CASE_P( CanaryChrome, CreateVisualElementsManifestTest, testing::Combine(testing::Values(install_static::CANARY_INDEX),
diff --git a/chrome/installer/setup/setup_install_details_unittest.cc b/chrome/installer/setup/setup_install_details_unittest.cc index 76bf3e47..829c29e 100644 --- a/chrome/installer/setup/setup_install_details_unittest.cc +++ b/chrome/installer/setup/setup_install_details_unittest.cc
@@ -73,42 +73,6 @@ L"beta", // Expect beta channel. }, { - L"setup.exe --chrome-beta", // User-level, secondary SxS beta mode. - L"", // New install. - L"", // Unused. - L"", // Unused. - install_static::BETA_INDEX, // Expect SxS beta mode. - false, // Expect user-level. - L"beta", // Expect beta channel. - }, - { - L"setup.exe --chrome-beta", // User-level, secondary SxS beta mode. - L"--uninstall --chrome-beta", // Update. - L"", // Unused. - L"", // Unused. - install_static::BETA_INDEX, // Expect SxS beta mode. - false, // Expect user-level. - L"beta", // Expect beta channel. - }, - { - L"setup.exe --chrome-dev", // User-level, secondary SxS dev mode. - L"", // New install. - L"", // Unused. - L"", // Unused. - install_static::DEV_INDEX, // Expect SxS dev mode. - false, // Expect user-level. - L"dev", // Expect dev channel. - }, - { - L"setup.exe --chrome-dev", // User-level, secondary SxS dev mode. - L"--uninstall --chrome-dev", // Update. - L"", // Unused. - L"", // Unused. - install_static::DEV_INDEX, // Expect SxS dev mode. - false, // Expect user-level. - L"dev", // Expect dev channel. - }, - { L"setup.exe --chrome-sxs", // User-level, secondary SxS canary mode. L"", // New install. L"", // Unused. @@ -165,46 +129,6 @@ true, // Expect system-level. L"beta", // Expect beta channel. }, - { - L"setup.exe --system-level --chrome-beta", // User-level, secondary SxS - // beta mode. - L"", // New install. - L"", // Unused. - L"", // Unused. - install_static::BETA_INDEX, // Expect SxS beta mode. - true, // Expect user-level. - L"beta", // Expect beta channel. - }, - { - L"setup.exe --system-level --chrome-beta", // User-level, secondary SxS - // beta mode. - L"--uninstall --system-level --chrome-beta", // Update. - L"", // Unused. - L"", // Unused. - install_static::BETA_INDEX, // Expect SxS beta mode. - true, // Expect user-level. - L"beta", // Expect beta channel. - }, - { - L"setup.exe --system-level --chrome-dev", // User-level, secondary SxS - // dev mode. - L"", // New install. - L"", // Unused. - L"", // Unused. - install_static::DEV_INDEX, // Expect SxS dev mode. - true, // Expect user-level. - L"dev", // Expect dev channel. - }, - { - L"setup.exe --system-level --chrome-dev", // User-level, secondary SxS - // dev mode. - L"--uninstall --system-level --chrome-dev", // Update. - L"", // Unused. - L"", // Unused. - install_static::DEV_INDEX, // Expect SxS dev mode. - true, // Expect user-level. - L"dev", // Expect dev channel. - }, }; #else // GOOGLE_CHROME_BUILD constexpr TestData kTestData[] = {
diff --git a/chrome/installer/util/beacons_unittest.cc b/chrome/installer/util/beacons_unittest.cc index 4f3e7dc..77d76cc 100644 --- a/chrome/installer/util/beacons_unittest.cc +++ b/chrome/installer/util/beacons_unittest.cc
@@ -225,18 +225,6 @@ DefaultBrowserBeaconTest, testing::Combine(testing::Values(install_static::STABLE_INDEX), testing::Values("user", "system"))); -// Beta supports user and system levels. -INSTANTIATE_TEST_CASE_P( - Beta, - DefaultBrowserBeaconTest, - testing::Combine(testing::Values(install_static::BETA_INDEX), - testing::Values("user", "system"))); -// Dev supports user and system levels. -INSTANTIATE_TEST_CASE_P( - Dev, - DefaultBrowserBeaconTest, - testing::Combine(testing::Values(install_static::DEV_INDEX), - testing::Values("user", "system"))); // Canary is only at user level. INSTANTIATE_TEST_CASE_P( Canary,
diff --git a/chrome/installer/util/l10n_string_util_unittest.cc b/chrome/installer/util/l10n_string_util_unittest.cc index 688c97de..6b0010d 100644 --- a/chrome/installer/util/l10n_string_util_unittest.cc +++ b/chrome/installer/util/l10n_string_util_unittest.cc
@@ -54,14 +54,6 @@ {IDS_APP_SHORTCUTS_SUBDIR_NAME_BASE, IDS_INBOUND_MDNS_RULE_DESCRIPTION_BASE, IDS_INBOUND_MDNS_RULE_NAME_BASE, IDS_PRODUCT_NAME_BASE}); - mode_to_strings[install_static::BETA_INDEX] = std::vector<int>( - {IDS_APP_SHORTCUTS_SUBDIR_NAME_BETA_BASE, - IDS_INBOUND_MDNS_RULE_DESCRIPTION_BETA_BASE, - IDS_INBOUND_MDNS_RULE_NAME_BETA_BASE, IDS_SHORTCUT_NAME_BETA_BASE}); - mode_to_strings[install_static::DEV_INDEX] = std::vector<int>( - {IDS_APP_SHORTCUTS_SUBDIR_NAME_DEV_BASE, - IDS_INBOUND_MDNS_RULE_DESCRIPTION_DEV_BASE, - IDS_INBOUND_MDNS_RULE_NAME_DEV_BASE, IDS_SHORTCUT_NAME_DEV_BASE}); mode_to_strings[install_static::CANARY_INDEX] = std::vector<int>( {IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY_BASE, IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY_BASE,
diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py index ce885e0..ec65466 100755 --- a/chrome/installer/util/prebuild/create_string_rc.py +++ b/chrome/installer/util/prebuild/create_string_rc.py
@@ -44,12 +44,15 @@ from grit.extern import tclib # The IDs of strings we want to import from the .grd files and include in -# setup.exe's resources. These strings are universal for all brands. +# setup.exe's resources. STRING_IDS = [ 'IDS_ABOUT_VERSION_COMPANY_NAME', 'IDS_APP_SHORTCUTS_SUBDIR_NAME', + 'IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY', 'IDS_INBOUND_MDNS_RULE_DESCRIPTION', + 'IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY', 'IDS_INBOUND_MDNS_RULE_NAME', + 'IDS_INBOUND_MDNS_RULE_NAME_CANARY', 'IDS_INSTALL_EXISTING_VERSION_LAUNCHED', 'IDS_INSTALL_FAILED', 'IDS_INSTALL_HIGHER_VERSION', @@ -66,6 +69,7 @@ 'IDS_SETUP_PATCH_FAILED', 'IDS_SHORTCUT_NEW_WINDOW', 'IDS_SHORTCUT_TOOLTIP', + 'IDS_SXS_SHORTCUT_NAME', ] # Certain strings are conditional on a brand's install mode (see @@ -102,8 +106,6 @@ 'IDS_APP_SHORTCUTS_SUBDIR_NAME': { 'google_chrome': [ 'IDS_APP_SHORTCUTS_SUBDIR_NAME', - 'IDS_APP_SHORTCUTS_SUBDIR_NAME_BETA', - 'IDS_APP_SHORTCUTS_SUBDIR_NAME_DEV', 'IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY', ], 'chromium': [ @@ -113,8 +115,6 @@ 'IDS_INBOUND_MDNS_RULE_DESCRIPTION': { 'google_chrome': [ 'IDS_INBOUND_MDNS_RULE_DESCRIPTION', - 'IDS_INBOUND_MDNS_RULE_DESCRIPTION_BETA', - 'IDS_INBOUND_MDNS_RULE_DESCRIPTION_DEV', 'IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY', ], 'chromium': [ @@ -124,8 +124,6 @@ 'IDS_INBOUND_MDNS_RULE_NAME': { 'google_chrome': [ 'IDS_INBOUND_MDNS_RULE_NAME', - 'IDS_INBOUND_MDNS_RULE_NAME_BETA', - 'IDS_INBOUND_MDNS_RULE_NAME_DEV', 'IDS_INBOUND_MDNS_RULE_NAME_CANARY', ], 'chromium': [ @@ -139,8 +137,6 @@ 'IDS_PRODUCT_NAME': { 'google_chrome': [ 'IDS_PRODUCT_NAME', - 'IDS_SHORTCUT_NAME_BETA', - 'IDS_SHORTCUT_NAME_DEV', 'IDS_SXS_SHORTCUT_NAME', ], 'chromium': [ @@ -161,17 +157,17 @@ Attributes: messages: A dict mapping string identifiers to their corresponding messages. """ - def __init__(self, string_id_set): + def __init__(self, string_ids): """Constructs a handler that reads selected strings from a .grd file. The dict attribute |messages| is populated with the strings that are read. Args: - string_id_set: A set of message identifiers to extract. + string_ids: A list of message identifiers to extract. """ sax.handler.ContentHandler.__init__(self) self.messages = {} - self.__id_set = string_id_set + self.__id_set = set(string_ids) self.__message_name = None self.__element_stack = [] self.__text_scraps = [] @@ -310,10 +306,9 @@ self.brand = brand def MakeFiles(self): - string_id_set = self.__BuildStringIds() - translated_strings = self.__ReadSourceAndTranslatedStrings(string_id_set) + translated_strings = self.__ReadSourceAndTranslatedStrings() self.__WriteRCFile(translated_strings) - self.__WriteHeaderFile(string_id_set, translated_strings) + self.__WriteHeaderFile(translated_strings) class __TranslationData(object): """A container of information about a single translation.""" @@ -327,21 +322,7 @@ id_result = cmp(self.resource_id_str, other.resource_id_str) return cmp(self.language, other.language) if id_result == 0 else id_result - def __BuildStringIds(self): - """Returns the set of string IDs to extract from the grd and xtb files.""" - # Start with the strings that apply to all brands. - string_id_set = set(STRING_IDS) - # Add in the strings for the current brand. - for string_id, brands in MODE_SPECIFIC_STRINGS.iteritems(): - brand_strings = brands.get(self.brand) - if not brand_strings: - raise exceptions.RuntimeError( - 'No strings declared for brand \'%s\' in MODE_SPECIFIC_STRINGS for ' - 'message %s' % (self.brand, string_id)) - string_id_set.update(brand_strings) - return string_id_set - - def __ReadSourceAndTranslatedStrings(self, string_id_set): + def __ReadSourceAndTranslatedStrings(self): """Reads the source strings and translations from all inputs.""" translated_strings = [] for grd_file, xtb_dir in self.inputs: @@ -351,20 +332,18 @@ xtb_pattern = os.path.join(os.path.dirname(grd_file), xtb_dir, '%s*.xtb' % source_name) translated_strings.extend( - self.__ReadSourceAndTranslationsFrom(string_id_set, grd_file, - glob.glob(xtb_pattern))) + self.__ReadSourceAndTranslationsFrom(grd_file, glob.glob(xtb_pattern))) translated_strings.sort() return translated_strings - def __ReadSourceAndTranslationsFrom(self, string_id_set, grd_file, xtb_files): + def __ReadSourceAndTranslationsFrom(self, grd_file, xtb_files): """Reads source strings and translations for a .grd file. Reads the source strings and all available translations for the messages - identified by string_id_set. The source string is used where translations - are missing. + identified by STRING_IDS. The source string is used where translations are + missing. Args: - string_id_set: The identifiers of the strings to read. grd_file: Path to a .grd file. xtb_files: List of paths to .xtb files. @@ -374,7 +353,7 @@ sax_parser = sax.make_parser() # Read the source (en-US) string from the .grd file. - grd_handler = GrdHandler(string_id_set) + grd_handler = GrdHandler(STRING_IDS) sax_parser.setContentHandler(grd_handler) sax_parser.parse(grd_file) source_strings = grd_handler.messages @@ -438,7 +417,7 @@ escaped_text)) outfile.write(FOOTER_TEXT) - def __WriteHeaderFile(self, string_id_set, translated_strings): + def __WriteHeaderFile(self, translated_strings): """Writes a .h file with resource ids.""" # TODO(grt): Stream the lines to the file rather than building this giant # list of lines first. @@ -482,7 +461,7 @@ % (string_id, ', '.join([ ('%s_BASE' % s) for s in brand_strings]))) # Write out base ID values. - for string_id in sorted(string_id_set): + for string_id in STRING_IDS: lines.append('#define %s_BASE %s_%s' % (string_id, string_id, translated_strings[0].language))
diff --git a/chrome/test/mini_installer/config/chrome_beta_installed.prop b/chrome/test/mini_installer/config/chrome_beta_installed.prop deleted file mode 100644 index a88c6584..0000000 --- a/chrome/test/mini_installer/config/chrome_beta_installed.prop +++ /dev/null
@@ -1,40 +0,0 @@ -{ - "Condition": "'$BRAND' == 'Google Chrome'", - "Files": { - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\chrome.exe": {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\chrome.VisualElementsManifest.xml": {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION": - {"exists": false} - }, - "RegistryEntries": { - "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_BETA": { - "exists": "required", - "values": { - "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"} - } - }, - "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$CHROME_LONG_NAME_BETA": { - "exists": "required", - "values": { - "UninstallString": { - "type": "SZ", - "data": "\"$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --chrome-beta --verbose-logging" - }, - "Version": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"} - } - }, - "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME_BETA$USER_SPECIFIC_REGISTRY_SUFFIX": { - "exists": "forbidden" - } - } -}
diff --git a/chrome/test/mini_installer/config/chrome_beta_no_pv.prop b/chrome/test/mini_installer/config/chrome_beta_no_pv.prop deleted file mode 100644 index 537a027..0000000 --- a/chrome/test/mini_installer/config/chrome_beta_no_pv.prop +++ /dev/null
@@ -1,11 +0,0 @@ -{ - "Condition": "'$BRAND' == 'Google Chrome'", - "RegistryEntries": { - "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_BETA": { - "exists": "optional", - "values": { - "pv": {} - } - } - } -}
diff --git a/chrome/test/mini_installer/config/chrome_beta_not_installed.prop b/chrome/test/mini_installer/config/chrome_beta_not_installed.prop deleted file mode 100644 index 302fe79..0000000 --- a/chrome/test/mini_installer/config/chrome_beta_not_installed.prop +++ /dev/null
@@ -1,19 +0,0 @@ -{ - "Condition": "'$BRAND' == 'Google Chrome'", - "Files": { - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application": { - "exists": false - } - }, - "RegistryEntries": { - "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_BETA": { - "exists": "forbidden" - }, - "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$CHROME_LONG_NAME_BETA": { - "exists": "forbidden" - }, - "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME_BETA$USER_SPECIFIC_REGISTRY_SUFFIX": { - "exists": "forbidden" - } - } -}
diff --git a/chrome/test/mini_installer/config/chrome_beta_not_inuse.prop b/chrome/test/mini_installer/config/chrome_beta_not_inuse.prop deleted file mode 100644 index 00bbcf7..0000000 --- a/chrome/test/mini_installer/config/chrome_beta_not_inuse.prop +++ /dev/null
@@ -1,8 +0,0 @@ -{ - "Condition": "'$BRAND' == 'Google Chrome'", - "Processes": { - "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\chrome.exe": { - "running": false - } - } -}
diff --git a/chrome/test/mini_installer/config/chrome_canary_installed.prop b/chrome/test/mini_installer/config/chrome_canary_installed.prop index 41728c4..12fa056a 100644 --- a/chrome/test/mini_installer/config/chrome_canary_installed.prop +++ b/chrome/test/mini_installer/config/chrome_canary_installed.prop
@@ -1,5 +1,5 @@ { - "Condition": "'$BRAND' == 'Google Chrome'", + "Condition": "$SUPPORTS_SXS", "Files": { "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe": {"exists": true}, "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
diff --git a/chrome/test/mini_installer/config/chrome_canary_inuse.prop b/chrome/test/mini_installer/config/chrome_canary_inuse.prop index 324b2818..cdbffc0 100644 --- a/chrome/test/mini_installer/config/chrome_canary_inuse.prop +++ b/chrome/test/mini_installer/config/chrome_canary_inuse.prop
@@ -1,5 +1,5 @@ { - "Condition": "'$BRAND' == 'Google Chrome'", + "Condition": "$SUPPORTS_SXS", "Processes": { "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe": {"running": true} }
diff --git a/chrome/test/mini_installer/config/chrome_canary_no_pv.prop b/chrome/test/mini_installer/config/chrome_canary_no_pv.prop index 8260c17..6945853 100644 --- a/chrome/test/mini_installer/config/chrome_canary_no_pv.prop +++ b/chrome/test/mini_installer/config/chrome_canary_no_pv.prop
@@ -1,5 +1,5 @@ { - "Condition": "'$BRAND' == 'Google Chrome'", + "Condition": "$SUPPORTS_SXS", "RegistryEntries": { "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_SXS": { "exists": "optional",
diff --git a/chrome/test/mini_installer/config/chrome_canary_not_installed.prop b/chrome/test/mini_installer/config/chrome_canary_not_installed.prop index fe2c1cf..66b24ba9 100644 --- a/chrome/test/mini_installer/config/chrome_canary_not_installed.prop +++ b/chrome/test/mini_installer/config/chrome_canary_not_installed.prop
@@ -1,5 +1,5 @@ { - "Condition": "'$BRAND' == 'Google Chrome'", + "Condition": "$SUPPORTS_SXS", "Files": { "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application": { "exists": false
diff --git a/chrome/test/mini_installer/config/chrome_canary_not_inuse.prop b/chrome/test/mini_installer/config/chrome_canary_not_inuse.prop index b9a2d2c7..65b146a 100644 --- a/chrome/test/mini_installer/config/chrome_canary_not_inuse.prop +++ b/chrome/test/mini_installer/config/chrome_canary_not_inuse.prop
@@ -1,5 +1,5 @@ { - "Condition": "'$BRAND' == 'Google Chrome'", + "Condition": "$SUPPORTS_SXS", "Processes": { "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe": { "running": false
diff --git a/chrome/test/mini_installer/config/chrome_canary_updated.prop b/chrome/test/mini_installer/config/chrome_canary_updated.prop index 175212c..a78550d 100644 --- a/chrome/test/mini_installer/config/chrome_canary_updated.prop +++ b/chrome/test/mini_installer/config/chrome_canary_updated.prop
@@ -1,5 +1,5 @@ { - "Condition": "'$BRAND' == 'Google Chrome'", + "Condition": "$SUPPORTS_SXS", "Files": { "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe": {"exists": true}, "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
diff --git a/chrome/test/mini_installer/config/chrome_dev_installed.prop b/chrome/test/mini_installer/config/chrome_dev_installed.prop deleted file mode 100644 index 92df03c65..0000000 --- a/chrome/test/mini_installer/config/chrome_dev_installed.prop +++ /dev/null
@@ -1,40 +0,0 @@ -{ - "Condition": "'$BRAND' == 'Google Chrome'", - "Files": { - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\chrome.exe": {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\chrome.VisualElementsManifest.xml": {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest": - {"exists": true}, - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION": - {"exists": false} - }, - "RegistryEntries": { - "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_DEV": { - "exists": "required", - "values": { - "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"} - } - }, - "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$CHROME_LONG_NAME_DEV": { - "exists": "required", - "values": { - "UninstallString": { - "type": "SZ", - "data": "\"$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --chrome-dev --verbose-logging" - }, - "Version": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"} - } - }, - "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME_DEV$USER_SPECIFIC_REGISTRY_SUFFIX": { - "exists": "forbidden" - } - } -}
diff --git a/chrome/test/mini_installer/config/chrome_dev_no_pv.prop b/chrome/test/mini_installer/config/chrome_dev_no_pv.prop deleted file mode 100644 index e80f2d2..0000000 --- a/chrome/test/mini_installer/config/chrome_dev_no_pv.prop +++ /dev/null
@@ -1,11 +0,0 @@ -{ - "Condition": "'$BRAND' == 'Google Chrome'", - "RegistryEntries": { - "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_DEV": { - "exists": "optional", - "values": { - "pv": {} - } - } - } -}
diff --git a/chrome/test/mini_installer/config/chrome_dev_not_installed.prop b/chrome/test/mini_installer/config/chrome_dev_not_installed.prop deleted file mode 100644 index d907945..0000000 --- a/chrome/test/mini_installer/config/chrome_dev_not_installed.prop +++ /dev/null
@@ -1,19 +0,0 @@ -{ - "Condition": "'$BRAND' == 'Google Chrome'", - "Files": { - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application": { - "exists": false - } - }, - "RegistryEntries": { - "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_DEV": { - "exists": "forbidden" - }, - "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$CHROME_LONG_NAME_DEV": { - "exists": "forbidden" - }, - "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME_DEV$USER_SPECIFIC_REGISTRY_SUFFIX": { - "exists": "forbidden" - } - } -}
diff --git a/chrome/test/mini_installer/config/chrome_dev_not_inuse.prop b/chrome/test/mini_installer/config/chrome_dev_not_inuse.prop deleted file mode 100644 index 0a9c9ac..0000000 --- a/chrome/test/mini_installer/config/chrome_dev_not_inuse.prop +++ /dev/null
@@ -1,8 +0,0 @@ -{ - "Condition": "'$BRAND' == 'Google Chrome'", - "Processes": { - "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\chrome.exe": { - "running": false - } - } -}
diff --git a/chrome/test/mini_installer/config/config.config b/chrome/test/mini_installer/config/config.config index 9326154..6860526 100644 --- a/chrome/test/mini_installer/config/config.config +++ b/chrome/test/mini_installer/config/config.config
@@ -1,196 +1,87 @@ { "states": [ ["no_pv", ["chrome_user_no_pv.prop", - "chrome_beta_no_pv.prop", "chrome_canary_no_pv.prop", - "chrome_dev_no_pv.prop", "chrome_system_no_pv.prop"]], ["clean", ["chrome_user_not_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_not_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], ["chrome_user_installed_not_inuse", ["chrome_user_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_not_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", - "chrome_system_not_inuse.prop"]], - ["chrome_beta_installed_not_inuse", ["chrome_user_not_installed.prop", - "chrome_beta_installed.prop", - "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", - "chrome_system_not_installed.prop", - "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", - "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], ["chrome_canary_installed_not_inuse", ["chrome_user_not_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_not_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], - ["chrome_user_and_beta_installed_not_inuse", [ - "chrome_user_installed.prop", - "chrome_beta_installed.prop", - "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", - "chrome_system_not_installed.prop", - "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", - "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", - "chrome_system_not_inuse.prop"]], - ["chrome_user_and_beta_and_dev_installed_not_inuse", [ - "chrome_user_installed.prop", - "chrome_beta_installed.prop", - "chrome_canary_not_installed.prop", - "chrome_dev_installed.prop", - "chrome_system_not_installed.prop", - "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", - "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", - "chrome_system_not_inuse.prop"]], - ["chrome_user_and_beta_and_dev_and_canary_installed_not_inuse", [ - "chrome_user_installed.prop", - "chrome_beta_installed.prop", - "chrome_canary_installed.prop", - "chrome_dev_installed.prop", - "chrome_system_not_installed.prop", - "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", - "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", - "chrome_system_not_inuse.prop"]], - ["chrome_beta_and_dev_and_canary_installed_not_inuse", [ - "chrome_user_not_installed.prop", - "chrome_beta_installed.prop", - "chrome_canary_installed.prop", - "chrome_dev_installed.prop", - "chrome_system_not_installed.prop", - "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", - "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", - "chrome_system_not_inuse.prop"]], - ["chrome_dev_and_canary_installed_not_inuse", [ - "chrome_user_not_installed.prop", - "chrome_beta_not_installed.prop", - "chrome_canary_installed.prop", - "chrome_dev_installed.prop", - "chrome_system_not_installed.prop", - "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", - "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", - "chrome_system_not_inuse.prop"]], ["chrome_multi_user_installed_not_inuse", ["chrome_multi_user_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_not_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], ["chrome_system_installed_not_inuse", ["chrome_user_not_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], + ["chrome_user_and_canary_installed_not_inuse", ["chrome_user_installed.prop", + "chrome_canary_installed.prop", + "chrome_system_not_installed.prop", + "chrome_user_not_inuse.prop", + "chrome_canary_not_inuse.prop", + "chrome_system_not_inuse.prop"]], ["chrome_user_installed_inuse", ["chrome_user_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_not_installed.prop", "chrome_user_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], ["chrome_canary_installed_inuse", ["chrome_user_not_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_not_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], ["chrome_system_installed_inuse", ["chrome_user_not_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_inuse.prop"]], ["no_chrome_user", ["chrome_user_killed.prop"]], ["no_chrome_user_binaries", ["chrome_user_binaries_killed.prop"]], ["chrome_user_updated_not_inuse", ["chrome_user_updated.prop", - "chrome_beta_not_installed.prop", "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_not_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], ["chrome_canary_updated_not_inuse", ["chrome_user_not_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_updated.prop", - "chrome_dev_not_installed.prop", "chrome_system_not_installed.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]], ["chrome_system_updated_not_inuse", ["chrome_user_not_installed.prop", - "chrome_beta_not_installed.prop", "chrome_canary_not_installed.prop", - "chrome_dev_not_installed.prop", "chrome_system_updated.prop", "chrome_user_not_inuse.prop", - "chrome_beta_not_inuse.prop", "chrome_canary_not_inuse.prop", - "chrome_dev_not_inuse.prop", "chrome_system_not_inuse.prop"]] ], "actions": [ - ["install_chrome_beta", - "\"$MINI_INSTALLER\" --chrome-beta --verbose-logging --do-not-launch-chrome"], ["install_chrome_canary", "\"$MINI_INSTALLER\" --chrome-sxs --verbose-logging --do-not-launch-chrome"], - ["install_chrome_dev", - "\"$MINI_INSTALLER\" --chrome-dev --verbose-logging --do-not-launch-chrome"], ["install_chrome_system", "\"$MINI_INSTALLER\" --verbose-logging --system-level --do-not-launch-chrome"], ["install_chrome_user", @@ -213,12 +104,8 @@ "python quit_chrome.py \"$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe\""], ["quit_chrome_user", "python quit_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""], - ["uninstall_chrome_beta", - "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME_BETA\""], ["uninstall_chrome_canary", "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME_SXS\""], - ["uninstall_chrome_dev", - "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME_DEV\""], ["uninstall_chrome_system", "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME\" --system-level"], ["uninstall_chrome_user", @@ -251,19 +138,9 @@ ] }, { - "name": "ChromeBeta", - "description": "Verifies that Chrome Beta can be installed and uninstalled.", - "condition": "'$BRAND' == 'Google Chrome'", - "traversal": [ - "no_pv", - "install_chrome_beta", "chrome_beta_installed_not_inuse", - "uninstall_chrome_beta", "clean" - ] - }, - { "name": "ChromeCanary", "description": "Verifies that Chrome SxS can be installed and uninstalled.", - "condition": "'$BRAND' == 'Google Chrome'", + "condition": "$SUPPORTS_SXS", "traversal": [ "no_pv", "install_chrome_canary", "chrome_canary_installed_not_inuse", @@ -273,7 +150,7 @@ { "name": "ChromeCanaryUpdate", "description": "Verifies that Chrome SxS can be updated.", - "condition": "'$BRAND' == 'Google Chrome'", + "condition": "$SUPPORTS_SXS", "traversal": [ "no_pv", "install_chrome_canary", "chrome_canary_installed_not_inuse", @@ -282,16 +159,6 @@ ] }, { - "name": "ChromeDev", - "description": "Verifies that Chrome Dev can be installed and uninstalled.", - "condition": "'$BRAND' == 'Google Chrome'", - "traversal": [ - "no_pv", - "install_chrome_dev", "chrome_dev_installed_not_inuse", - "uninstall_chrome_dev", "clean" - ] - }, - { "name": "ChromeSystemLevel", "description": "Verifies that system-level Chrome can be installed and uninstalled.", "traversal": [ @@ -311,18 +178,14 @@ ] }, { - "name": "AllChromeUserLevel", - "description": "Verifies that user-level Chrome, Chrome Beta, Chrome Dev, and Chrome SxS can all be installed simultaneously.", - "condition": "'$BRAND' == 'Google Chrome'", + "name": "ChromeUserLevelWithCanary", + "description": "Verifies that user-level Chrome and Chrome SxS can be installed simultaneously.", + "condition": "$SUPPORTS_SXS", "traversal": [ "no_pv", "install_chrome_user", "chrome_user_installed_not_inuse", - "install_chrome_beta", "chrome_user_and_beta_installed_not_inuse", - "install_chrome_dev", "chrome_user_and_beta_and_dev_installed_not_inuse", - "install_chrome_canary", "chrome_user_and_beta_and_dev_and_canary_installed_not_inuse", - "uninstall_chrome_user", "chrome_beta_and_dev_and_canary_installed_not_inuse", - "uninstall_chrome_beta", "chrome_dev_and_canary_installed_not_inuse", - "uninstall_chrome_dev", "chrome_canary_installed_not_inuse", + "install_chrome_canary", "chrome_user_and_canary_installed_not_inuse", + "uninstall_chrome_user", "chrome_canary_installed_not_inuse", "uninstall_chrome_canary", "clean" ] },
diff --git a/chrome/test/mini_installer/mini_installer_test.gni b/chrome/test/mini_installer/mini_installer_test.gni index eef8dca..dc663a8 100644 --- a/chrome/test/mini_installer/mini_installer_test.gni +++ b/chrome/test/mini_installer/mini_installer_test.gni
@@ -7,19 +7,11 @@ mini_installer_test_files = get_path_info([ "chrome_helper.py", - "config/chrome_beta_installed.prop", - "config/chrome_beta_no_pv.prop", - "config/chrome_beta_not_installed.prop", - "config/chrome_beta_not_inuse.prop", "config/chrome_canary_installed.prop", "config/chrome_canary_inuse.prop", "config/chrome_canary_no_pv.prop", "config/chrome_canary_not_installed.prop", "config/chrome_canary_not_inuse.prop", - "config/chrome_dev_installed.prop", - "config/chrome_dev_no_pv.prop", - "config/chrome_dev_not_installed.prop", - "config/chrome_dev_not_inuse.prop", "config/chrome_system_installed.prop", "config/chrome_system_inuse.prop", "config/chrome_system_no_pv.prop",
diff --git a/chrome/test/mini_installer/test_installer.py b/chrome/test/mini_installer/test_installer.py index 21f10a9..c0c9a91 100644 --- a/chrome/test/mini_installer/test_installer.py +++ b/chrome/test/mini_installer/test_installer.py
@@ -207,17 +207,9 @@ (True, '$CHROME_LONG_NAME', '--system-level', '$CHROME_UPDATE_REGISTRY_SUBKEY'), ] - if variable_expander.Expand('$BRAND') == 'Google Chrome': - data.extend([(False, '$CHROME_LONG_NAME_BETA', '', - '$CHROME_UPDATE_REGISTRY_SUBKEY_BETA'), - (True, '$CHROME_LONG_NAME_BETA', '--system-level', - '$CHROME_UPDATE_REGISTRY_SUBKEY_BETA'), - (False, '$CHROME_LONG_NAME_DEV', '', - '$CHROME_UPDATE_REGISTRY_SUBKEY_DEV'), - (True, '$CHROME_LONG_NAME_DEV', '--system-level', - '$CHROME_UPDATE_REGISTRY_SUBKEY_DEV'), - (False, '$CHROME_LONG_NAME_SXS', '', - '$CHROME_UPDATE_REGISTRY_SUBKEY_SXS')]) + if variable_expander.Expand('$SUPPORTS_SXS') == 'True': + data.append((False, '$CHROME_LONG_NAME_SXS', '', + '$CHROME_UPDATE_REGISTRY_SUBKEY_SXS')) interactive_option = '--interactive' if not force_clean else '' for system_level, product_name, product_switch, registry_subkey in data:
diff --git a/chrome/test/mini_installer/variable_expander.py b/chrome/test/mini_installer/variable_expander.py index 28f6ef1..551bf61b 100644 --- a/chrome/test/mini_installer/variable_expander.py +++ b/chrome/test/mini_installer/variable_expander.py
@@ -61,32 +61,19 @@ The constructor initializes a variable dictionary that maps variables to their values. These are the only acceptable variables: - * $BRAND: the browser brand (e.g., "Google Chrome" or "Chromium"). * $CHROME_DIR: the directory of Chrome (or Chromium) from the base installation directory. * $CHROME_HTML_PROG_ID: 'ChromeHTML' (or 'ChromiumHTM'). * $CHROME_LONG_NAME: 'Google Chrome' (or 'Chromium'). - * $CHROME_LONG_NAME_BETA: 'Google Chrome Beta' if $BRAND is 'Google - * Chrome'. - * $CHROME_LONG_NAME_DEV: 'Google Chrome Dev' if $BRAND is 'Google - * Chrome'. - * $CHROME_LONG_NAME_SXS: 'Google Chrome SxS' if $BRAND is 'Google - * Chrome'. + * $CHROME_LONG_NAME_SXS: 'Google Chrome SxS' if $SUPPORTS_SXS. * $CHROME_SHORT_NAME: 'Chrome' (or 'Chromium'). - * $CHROME_SHORT_NAME_BETA: 'ChromeBeta' if $BRAND is 'Google Chrome'. - * $CHROME_SHORT_NAME_DEV: 'ChromeDev' if $BRAND is 'Google Chrome'. - * $CHROME_SHORT_NAME_SXS: 'ChromeCanary' if $BRAND is 'Google Chrome'. + * $CHROME_SHORT_NAME_SXS: 'ChromeCanary' if $SUPPORTS_SXS. * $CHROME_UPDATE_REGISTRY_SUBKEY: the registry key, excluding the root key, of Chrome for Google Update. - * $CHROME_UPDATE_REGISTRY_SUBKEY_DEV: the registry key, excluding the - root key, of Chrome Dev for Google Update. - * $CHROME_UPDATE_REGISTRY_SUBKEY_BETA: the registry key, excluding the - root key, of Chrome Beta for Google Update. * $CHROME_UPDATE_REGISTRY_SUBKEY_SXS: the registry key, excluding the root key, of Chrome SxS for Google Update. * $LAUNCHER_UPDATE_REGISTRY_SUBKEY: the registry key, excluding the root - key, of the app launcher for Google Update if $BRAND is 'Google - * Chrome'. + key, of the app launcher for Google Update if $SUPPORTS_SXS. * $LOCAL_APPDATA: the unquoted path to the Local Application Data folder. * $MINI_INSTALLER: the unquoted path to the mini_installer. @@ -96,6 +83,8 @@ * $NEXT_VERSION_MINI_INSTALLER_FILE_VERSION: the file version of $NEXT_VERSION_MINI_INSTALLER. * $PROGRAM_FILES: the unquoted path to the Program Files folder. + * $SUPPORTS_SXS: a boolean indicating whether or not SxS installs + are supported by the mini_installer under test. * $USER_SPECIFIC_REGISTRY_SUFFIX: the output from the function _GetUserSpecificRegistrySuffix(). * $VERSION_[XP/SERVER_2003/VISTA/WIN7/WIN8/WIN8_1/WIN10]: a 2-tuple @@ -135,7 +124,6 @@ mini_installer_product_name = _GetProductName(mini_installer_abspath) if mini_installer_product_name == 'Google Chrome Installer': self._variable_mapping.update({ - 'BRAND': 'Google Chrome', 'BINARIES_UPDATE_REGISTRY_SUBKEY': ( 'Software\\Google\\Update\\Clients\\' '{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}'), @@ -149,21 +137,10 @@ 'CHROME_CLIENT_STATE_KEY': ( 'Software\\Google\\Update\\ClientState\\' '{8A69D345-D564-463c-AFF1-A69D9E530F96}'), - 'CHROME_DIR_BETA': 'Google\\Chrome Beta', - 'CHROME_DIR_DEV': 'Google\\Chrome Dev', + 'SUPPORTS_SXS': True, 'CHROME_DIR_SXS': 'Google\\Chrome SxS', - 'CHROME_LONG_NAME_BETA': 'Google Chrome Beta', - 'CHROME_LONG_NAME_DEV': 'Google Chrome Dev', 'CHROME_LONG_NAME_SXS': 'Google Chrome SxS', - 'CHROME_SHORT_NAME_BETA': 'ChromeBeta', - 'CHROME_SHORT_NAME_DEV': 'ChromeDev', 'CHROME_SHORT_NAME_SXS': 'ChromeCanary', - 'CHROME_UPDATE_REGISTRY_SUBKEY_BETA': ( - 'Software\\Google\\Update\\Clients\\' - '{8237E44A-0054-442C-B6B6-EA0509993955}'), - 'CHROME_UPDATE_REGISTRY_SUBKEY_DEV': ( - 'Software\\Google\\Update\\Clients\\' - '{401C381F-E0DE-4B85-8BD8-3F3F14FBDA57}'), 'CHROME_UPDATE_REGISTRY_SUBKEY_SXS': ( 'Software\\Google\\Update\\Clients\\' '{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}'), @@ -173,7 +150,6 @@ }) elif mini_installer_product_name == 'Chromium Installer': self._variable_mapping.update({ - 'BRAND': 'Chromium', 'BINARIES_UPDATE_REGISTRY_SUBKEY': 'Software\\Chromium Binaries', 'CHROME_DIR': 'Chromium', 'CHROME_HTML_PROG_ID': 'ChromiumHTM', @@ -181,6 +157,7 @@ 'CHROME_SHORT_NAME': 'Chromium', 'CHROME_UPDATE_REGISTRY_SUBKEY': 'Software\\Chromium', 'CHROME_CLIENT_STATE_KEY': 'Software\\Chromium', + 'SUPPORTS_SXS': False }) else: raise KeyError("Unknown mini_installer product name '%s'" %
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 5c19fcf..e9d7a0b 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -47490,6 +47490,14 @@ </summary> </histogram> +<histogram name="PageLoad.Navigation.RedirectChainLength" units="urls"> + <owner>csharrison@chromium.org</owner> + <summary> + The number of URLs in the redirect chain for this navigation. This excludes + the first URL. + </summary> +</histogram> + <histogram name="PageLoad.PageTiming.ForegroundDuration" units="ms"> <owner>bmcquade@chromium.org</owner> <summary>