morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 00:14:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update source_cleaner.sh to remove unnecessary code

Browse Source 
Update Iridium and Inox patches to work with new source tree
Add jinja file extension to domain_patcher.sh
This commit is contained in:
Eloston
2016-03-27 14:54:28 -07:00
parent d18f777273
commit 3f1d10bbf2
14 changed files with 95 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
domain_patcher.sh
View File

@@ -1,3 +1,3 @@
find . -path ./debian -prune -o -type f \( -name "*.h" -o -name "*.hh" -o -name "*.hpp" -o -name "*.hxx" -o -name "*.cc" -o -name "*.cpp" -o -name "*.cxx" -o -name "*.c" -o -name "*.h" -o -name "*.json" -o -name "*.js" -o -name "*.html" -o -name "*.htm" -o -name "*.py*" -o -name "*.grd" -o -name "*.sql" -o -name "*.idl" -o -name "*.mk" -o -name "*.gyp*" -o -name "Makefile" -o -name "makefile" -o -name "*.txt" -o -name "*.xml" -o -name "*.mm" \) -print | xargs -L1 -I{} sed -i -r -e 's/google([A-Za-z\-]*)\.com/9oo91e\1\.qjz9zk/g' -e 's/gstatic([A-Za-z\-]*)\.com/95tat1c\1\.qjz9zk/g' -e 's/chrome([A-Za-z\-]*)\.com/ch40me\1\.qjz9zk/g' -e 's/chromium([A-Za-z\-]*)\.org/ch40m1um\1\.qjz9zk/g' -e 's/mozilla([A-Za-z\-]*)\.org/m0z111a\1\.qjz9zk/g' -e 's/facebook([A-Za-z\-]*)\.com/f8c3b00k\1\.qjz9zk/g' -e 's/appspot([A-Za-z\-]*)\.com/8pp2p8t\1\.qjz9zk/g' -e 's/youtube([A-Za-z\-]*)\.com/y0u1ub3\1\.qjz9zk/g' -e 's/ytimg([A-Za-z\-]*)\.com/yt1mg\1\.qjz9zk/g' -e 's/gmail([A-Za-z\-]*)\.com/9ma1l\1\.qjz9zk/g' -e 's/doubleclick([A-Za-z\-]*)\.net/60u613cl1c4\1\.qjz9zk/g' {}
find . -path ./debian -prune -o -type f \( -name "*.h" -o -name "*.hh" -o -name "*.hpp" -o -name "*.hxx" -o -name "*.cc" -o -name "*.cpp" -o -name "*.cxx" -o -name "*.c" -o -name "*.h" -o -name "*.json" -o -name "*.js" -o -name "*.html" -o -name "*.htm" -o -name "*.py*" -o -name "*.grd" -o -name "*.sql" -o -name "*.idl" -o -name "*.mk" -o -name "*.gyp*" -o -name "Makefile" -o -name "makefile" -o -name "*.txt" -o -name "*.xml" -o -name "*.mm" -o -name "*.jinja*" \) -print | xargs -L1 -I{} sed -i -r -e 's/google([A-Za-z\-]*)\.com/9oo91e\1\.qjz9zk/g' -e 's/gstatic([A-Za-z\-]*)\.com/95tat1c\1\.qjz9zk/g' -e 's/chrome([A-Za-z\-]*)\.com/ch40me\1\.qjz9zk/g' -e 's/chromium([A-Za-z\-]*)\.org/ch40m1um\1\.qjz9zk/g' -e 's/mozilla([A-Za-z\-]*)\.org/m0z111a\1\.qjz9zk/g' -e 's/facebook([A-Za-z\-]*)\.com/f8c3b00k\1\.qjz9zk/g' -e 's/appspot([A-Za-z\-]*)\.com/8pp2p8t\1\.qjz9zk/g' -e 's/youtube([A-Za-z\-]*)\.com/y0u1ub3\1\.qjz9zk/g' -e 's/ytimg([A-Za-z\-]*)\.com/yt1mg\1\.qjz9zk/g' -e 's/gmail([A-Za-z\-]*)\.com/9ma1l\1\.qjz9zk/g' -e 's/doubleclick([A-Za-z\-]*)\.net/60u613cl1c4\1\.qjz9zk/g' {}
exit 0;

54
patches/inox-patchset/disable-autofill-download-manager.patch
View File

@@ -1,6 +1,6 @@
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
@@ -56,11 +56,6 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
@@ -86,11 +86,6 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
return std::string();
}
@@ -12,50 +12,20 @@
} // namespace
struct AutofillDownloadManager::FormRequestData {
@@ -190,46 +185,6 @@ void AutofillDownloadManager::SetNegativeUploadRate(double rate) {
@@ -174,6 +169,7 @@ bool AutofillDownloadManager::StartUploadRequest(
bool AutofillDownloadManager::StartRequest(
const std::string& form_xml,
const FormRequestData& request_data) {
- net::URLRequestContextGetter* request_context =
- driver_->GetURLRequestContext();
- DCHECK(request_context);
- GURL request_url = GetRequestUrl(request_data.request_type);
-
- std::string compressed_data;
- if (!compression::GzipCompress(form_xml, &compressed_data)) {
- NOTREACHED();
- return false;
- }
-
- AutofillMetrics::LogPayloadCompressionRatio(
- static_cast<int>(100 * compressed_data.size() / form_xml.size()),
- request_data.request_type);
-
- // Id is ignored for regular chrome, in unit test id's for fake fetcher
- // factory will be 0, 1, 2, ...
- net::URLFetcher* fetcher =
- net::URLFetcher::Create(fetcher_id_for_unittest_++, request_url,
- net::URLFetcher::POST, this).release();
- data_use_measurement::DataUseUserData::AttachToFetcher(
- fetcher, data_use_measurement::DataUseUserData::AUTOFILL);
- url_fetchers_[fetcher] = request_data;
- fetcher->SetAutomaticallyRetryOn5xx(false);
- fetcher->SetRequestContext(request_context);
- fetcher->SetUploadData("text/xml", compressed_data);
- fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
- net::LOAD_DO_NOT_SEND_COOKIES);
- // Add Chrome experiment state and GZIP encoding to the request headers.
- net::HttpRequestHeaders headers;
- headers.SetHeaderIfMissing("content-encoding", "gzip");
- variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders(
- fetcher->GetOriginalURL(), driver_->IsOffTheRecord(), false, &headers);
- fetcher->SetExtraRequestHeaders(headers.ToString());
- fetcher->Start();
-
- VLOG(1) << "Sending AutofillDownloadManager "
- << RequestTypeToString(request_data.request_type)
- << " request: " << form_xml;
+#if 0
net::URLRequestContextGetter* request_context =
driver_->GetURLRequestContext();
DCHECK(request_context);
@@ -215,7 +211,7 @@ bool AutofillDownloadManager::StartRequest(
<< RequestTypeToString(request_data.request_type)
<< " request (compression " << compression_ratio
<< "): " << request_data.payload;
-
+#endif
return true;
}

87
patches/inox-patchset/disable-default-extensions.patch
View File

@@ -1,77 +1,51 @@
--- ./chrome/browser/extensions/component_loader.cc
+++ ./chrome/browser/extensions/component_loader.cc.new
@@ -352,10 +352,6 @@
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -351,7 +351,7 @@ void ComponentLoader::AddWebstoreWidgetExtension() {
}
void ComponentLoader::AddHangoutServicesExtension() {
-#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
- Add(IDR_HANGOUT_SERVICES_MANIFEST,
- base::FilePath(FILE_PATH_LITERAL("hangout_services")));
-#endif
}
void ComponentLoader::AddHotwordAudioVerificationApp() {
@@ -389,43 +389,6 @@
+#if 0
Add(IDR_HANGOUT_SERVICES_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("hangout_services")));
#endif
@@ -388,7 +388,7 @@ void ComponentLoader::AddNetworkSpeechSynthesisExtension() {
}
void ComponentLoader::AddGoogleNowExtension() {
-#if defined(ENABLE_GOOGLE_NOW)
- const char kEnablePrefix[] = "Enable";
- const char kFieldTrialName[] = "GoogleNow";
- std::string enable_prefix(kEnablePrefix);
- std::string field_trial_result =
- base::FieldTrialList::FindFullName(kFieldTrialName);
-
- bool enabled_via_field_trial =
- field_trial_result.compare(0, enable_prefix.length(), enable_prefix) == 0;
-
- // Enable the feature on trybots and trunk builds.
- bool enabled_via_trunk_build =
- chrome::GetChannel() == version_info::Channel::UNKNOWN;
-
- bool is_authenticated =
- SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated();
-
- bool enabled =
- (enabled_via_field_trial && is_authenticated) || enabled_via_trunk_build;
-
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
- // Don't load if newer trial is running (== new extension id is available).
- std::string ignored_extension_id;
- if (GetGoogleNowExtensionId(&ignored_extension_id)) {
- enabled = false;
- }
-#endif // defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
-
- const int google_now_manifest_id = IDR_GOOGLE_NOW_MANIFEST;
- const base::FilePath root_directory =
- base::FilePath(FILE_PATH_LITERAL("google_now"));
- if (enabled) {
- Add(google_now_manifest_id, root_directory);
- } else {
- DeleteData(google_now_manifest_id, root_directory);
- }
-#endif // defined(ENABLE_GOOGLE_NOW)
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if 0
const char kEnablePrefix[] = "Enable";
const char kFieldTrialName[] = "GoogleNow";
std::string enable_prefix(kEnablePrefix);
@@ -424,7 +424,7 @@ void ComponentLoader::AddGoogleNowExtension() {
} else {
DeleteData(google_now_manifest_id, root_directory);
}
-#endif // BUILDFLAG(ENABLE_GOOGLE_NOW)
+#endif // 0
}
#if defined(OS_CHROMEOS)
@@ -501,15 +452,6 @@
@@ -500,15 +500,15 @@ void ComponentLoader::AddKeyboardApp() {
}
void ComponentLoader::AddWebStoreApp() {
-#if defined(OS_CHROMEOS)
- if (!IsNormalSession())
- return;
+#if 0
if (!IsNormalSession())
return;
-#endif
-
- AddWithNameAndDescription(
- IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")),
- l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE),
- l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
AddWithNameAndDescription(
IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")),
l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE),
l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
+#endif
}
scoped_refptr<const Extension> ComponentLoader::CreateExtension(
@@ -637,13 +579,6 @@
@@ -641,13 +641,6 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
AddImageLoaderExtension();
AddGoogleNowExtension();
@@ -85,4 +59,3 @@
#if defined(ENABLE_SETTINGS_APP)
Add(IDR_SETTINGS_APP_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("settings_app")));

6
patches/inox-patchset/disable-first-run-behaviour.patch
View File

@@ -1,6 +1,6 @@
--- ./chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ ./chrome/browser/ui/startup/startup_browser_creator_impl.cc.new
@@ -846,8 +846,6 @@
@@ -847,8 +847,6 @@
// Replace magic names for the actual urls.
if (it->host() == "new_tab_page") {
startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
@@ -9,7 +9,7 @@
} else {
startup_urls->push_back(*it);
}
@@ -862,10 +860,6 @@
@@ -863,10 +861,6 @@
if (startup_urls->empty()) {
AddSpecialURLs(startup_urls);
startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
@@ -20,7 +20,7 @@
}
if (signin::ShouldShowPromoAtStartup(profile_, is_first_run_)) {
@@ -899,10 +893,6 @@
@@ -901,10 +895,6 @@
void StartupBrowserCreatorImpl::AddSpecialURLs(
std::vector<GURL>* url_list) const {

64
patches/inox-patchset/disable-google-url-tracker.patch
View File

@@ -1,64 +0,0 @@
--- ./components/google/core/browser/google_url_tracker.cc
+++ ./components/google/core/browser/google_url_tracker.cc.new
@@ -22,9 +22,9 @@
const char GoogleURLTracker::kDefaultGoogleHomepage[] =
- "trk:192:https://www.9oo91e.qjz9zk/";
+ "trk:192:about:blank";
const char GoogleURLTracker::kSearchDomainCheckURL[] =
- "trk:193:https://www.9oo91e.qjz9zk/searchdomaincheck?format=domain&type=chrome";
+ "trk:193:about:blank";
GoogleURLTracker::GoogleURLTracker(scoped_ptr<GoogleURLTrackerClient> client,
Mode mode)
@@ -143,48 +143,4 @@
}
void GoogleURLTracker::StartFetchIfDesirable() {
- // Bail if a fetch isn't appropriate right now. This function will be called
- // again each time one of the preconditions changes, so we'll fetch
- // immediately once all of them are met.
- //
- // See comments in header on the class, on RequestServerCheck(), and on the
- // various members here for more detail on exactly what the conditions are.
- if (in_startup_sleep_ || already_fetched_ || !need_to_fetch_)
- return;
-
- // Some switches should disable the Google URL tracker entirely. If we can't
- // do background networking, we can't do the necessary fetch, and if the user
- // specified a Google base URL manually, we shouldn't bother to look up any
- // alternatives or offer to switch to them.
- if (!client_->IsBackgroundNetworkingEnabled() ||
- base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kGoogleBaseURL))
- return;
-
- already_fetched_ = true;
- fetcher_ = net::URLFetcher::Create(fetcher_id_, GURL(kSearchDomainCheckURL),
- net::URLFetcher::GET, this);
- data_use_measurement::DataUseUserData::AttachToFetcher(
- fetcher_.get(),
- data_use_measurement::DataUseUserData::GOOGLE_URL_TRACKER);
- ++fetcher_id_;
- // We don't want this fetch to set new entries in the cache or cookies, lest
- // we alarm the user.
- fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
- net::LOAD_DO_NOT_SAVE_COOKIES);
- fetcher_->SetRequestContext(client_->GetRequestContext());
-
- // Configure to retry at most kMaxRetries times for 5xx errors.
- static const int kMaxRetries = 5;
- fetcher_->SetMaxRetriesOn5xx(kMaxRetries);
-
- // Also retry kMaxRetries times on network change errors. A network change can
- // propagate through Chrome in various stages, so it's possible for this code
- // to be reached via OnNetworkChanged(), and then have the fetch we kick off
- // be canceled due to e.g. the DNS server changing at a later time. In general
- // it's not possible to ensure that by the time we reach here any requests we
- // start won't be canceled in this fashion, so retrying is the best we can do.
- fetcher_->SetAutomaticallyRetryOnNetworkChanges(kMaxRetries);
-
- fetcher_->Start();
}

4
patches/inox-patchset/disable-new-avatar-menu.patch
View File

@@ -1,6 +1,6 @@
--- ./chrome/browser/profiles/avatar_menu.cc
+++ ./chrome/browser/profiles/avatar_menu.cc.new
@@ -92,12 +92,7 @@
@@ -93,12 +93,7 @@
// TODO: Eliminate this ifdef. Add a delegate interface for the menu which
// would also help remove the Browser dependency in AvatarMenuActions
// implementations.
@@ -17,7 +17,7 @@
--- ./chrome/browser/ui/webui/options/browser_options_handler.cc
+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc.new
@@ -1436,7 +1436,7 @@
@@ -1443,7 +1443,7 @@
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
DCHECK(signin);
sync_status->SetBoolean("signoutAllowed", !signout_prohibited);

4
patches/inox-patchset/disable-translation-lang-fetch.patch
View File

@@ -1,6 +1,6 @@
--- ./chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ ./chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.new
@@ -145,7 +145,6 @@
@@ -148,7 +148,6 @@
return;
}
request_context_getter_ = request_context_getter;
@@ -8,7 +8,7 @@
}
bool SpellcheckHunspellDictionary::IsReady() const {
@@ -338,9 +337,6 @@
@@ -341,9 +340,6 @@
}
if (request_context_getter_) {

20
patches/inox-patchset/modify-default-prefs.patch
View File

@@ -1,6 +1,6 @@
--- ./components/autofill/core/browser/autofill_manager.cc
+++ ./components/autofill/core/browser/autofill_manager.cc.new
@@ -172,7 +172,7 @@ void AutofillManager::RegisterProfilePrefs(
@@ -142,7 +142,7 @@ void AutofillManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kAutofillEnabled,
@@ -13,8 +13,8 @@
--- ./chrome/browser/io_thread.cc
+++ ./chrome/browser/io_thread.cc.new
@@ -1015,7 +1015,7 @@
data_reduction_proxy::prefs::kDataReductionProxy, std::string());
@@ -1043,7 +1043,7 @@
std::string());
registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
data_reduction_proxy::RegisterPrefs(registry);
- registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
@@ -25,7 +25,7 @@
--- ./extensions/common/extension.cc
+++ ./extensions/common/extension.cc.new
@@ -355,7 +355,7 @@
@@ -358,7 +358,7 @@
if (extensions::Manifest::IsComponentLocation(location()) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kShowComponentExtensionOptions)) {
@@ -34,7 +34,7 @@
}
// Always show unpacked extensions and apps.
@@ -364,7 +364,7 @@
@@ -367,7 +367,7 @@
// Don't show apps that aren't visible in either launcher or ntp.
if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage())
@@ -47,7 +47,7 @@
--- ./components/bookmarks/browser/bookmark_utils.cc
+++ ./components/bookmarks/browser/bookmark_utils.cc.new
@@ -429,7 +429,7 @@
@@ -430,7 +430,7 @@
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kShowBookmarkBar,
@@ -56,7 +56,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true);
registry->RegisterBooleanPref(
@@ -434,7 +434,7 @@
@@ -435,7 +435,7 @@
registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true);
registry->RegisterBooleanPref(
prefs::kShowAppsShortcutInBookmarkBar,
@@ -69,7 +69,7 @@
--- ./chrome/browser/profiles/profile.cc
+++ ./chrome/browser/profiles/profile.cc.new
@@ -88,7 +88,7 @@
@@ -89,7 +89,7 @@
registry->RegisterStringPref(prefs::kSessionExitType, std::string());
registry->RegisterBooleanPref(
prefs::kSafeBrowsingEnabled,
@@ -78,7 +78,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled,
false);
@@ -104,7 +104,7 @@
@@ -105,7 +105,7 @@
// This pref is intentionally outside the above #if. That flag corresponds
// to the Notifier extension and does not gate the launcher page.
// TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827.
@@ -92,7 +92,7 @@
--- ./chrome/service/cloud_print/connector_settings.cc
+++ ./chrome/service/cloud_print/connector_settings.cc.new
@@ -58,7 +58,7 @@
@@ -60,7 +60,7 @@
DCHECK(server_url_.is_valid());
connect_new_printers_ = prefs->GetBoolean(

23
patches/inox-patchset/restore-classic-ntp.patch
View File

@@ -1,26 +1,3 @@
--- ./chrome/browser/search/search.cc
+++ ./chrome/browser/search/search.cc.new
@@ -266,17 +266,7 @@
template_url->new_tab_url_ref(), UIThreadSearchTermsData(profile),
false, false);
NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
- switch (state) {
- case NEW_TAB_URL_VALID:
- // We can use the search provider's page.
- return NewTabURLDetails(search_provider_url, state);
- case NEW_TAB_URL_INCOGNITO:
- // Incognito has its own New Tab.
- return NewTabURLDetails(GURL(), state);
- default:
- // Use the local New Tab otherwise.
- return NewTabURLDetails(local_url, state);
- }
+ return NewTabURLDetails(local_url, state);
}
GURL url;
--- ./chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
+++ ./chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc.new
@@ -91,14 +91,9 @@

188
patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
View File

@@ -715,48 +715,6 @@ index afb5954..aa7848f 100644
const wchar_t kDataFileName[] = L"gcp_driver.gpd";
const wchar_t kDriverName[] = L"MXDWDRV.DLL";
diff --git a/components/cloud_devices/common/cloud_devices_urls.cc b/components/cloud_devices/common/cloud_devices_urls.cc
index 7b4b711..5e58255 100644
--- a/components/cloud_devices/common/cloud_devices_urls.cc
+++ b/components/cloud_devices/common/cloud_devices_urls.cc
@@ -14,20 +14,20 @@
namespace cloud_devices {
const char kCloudPrintAuthScope[] =
- "https://www.9oo91eapis.qjz9zk/auth/cloudprint";
+ "trk:197:https://www.9oo91eapis.qjz9zk/auth/cloudprint";
const char kCloudPrintLearnMoreURL[] =
- "https://www.9oo91e.qjz9zk/support/cloudprint";
+ "trk:199:https://www.9oo91e.qjz9zk/support/cloudprint";
const char kCloudPrintTestPageURL[] =
- "http://www.9oo91e.qjz9zk/landing/cloudprint/enable.html?print=true";
+ "trk:200:http://www.9oo91e.qjz9zk/landing/cloudprint/enable.html?print=true";
namespace {
// Url must not be matched by "urls" section of
// cloud_print_app/manifest.json. If it's matched, print driver dialog will
// open sign-in page in separate window.
-const char kCloudPrintURL[] = "https://www.9oo91e.qjz9zk/cloudprint";
+const char kCloudPrintURL[] = "trk:201:https://www.9oo91e.qjz9zk/cloudprint";
}
diff --git a/components/copresence/rpc/rpc_handler.cc b/components/copresence/rpc/rpc_handler.cc
index d3ce789..069db42 100644
--- a/components/copresence/rpc/rpc_handler.cc
+++ b/components/copresence/rpc/rpc_handler.cc
@@ -54,7 +54,7 @@ const int kInvalidTokenExpiryTimeMinutes = 10;
const int kMaxInvalidTokens = 10000;
const char kRegisterDeviceRpcName[] = "registerdevice";
const char kDefaultCopresenceServer[] =
- "https://www.9oo91eapis.qjz9zk/copresence/v2/copresence";
+ "trk:259:https://www.9oo91eapis.qjz9zk/copresence/v2/copresence";
// UrlSafe is defined as:
// '/' represented by a '_' and '+' represented by a '-'
diff --git a/components/crash/content/app/breakpad_linux.cc b/components/crash/content/app/breakpad_linux.cc
index 3435f04..741f0e2 100644
--- a/components/crash/content/app/breakpad_linux.cc
@@ -783,26 +741,6 @@ index 38f94f7..f50b3fd 100644
const wchar_t kCheckPointFile[] = L"crash_checkpoint.txt";
typedef std::map<std::wstring, std::wstring> CrashMap;
diff --git a/components/drive/service/drive_api_service.cc b/components/drive/service/drive_api_service.cc
index 91c0225..ed7029f 100644
--- a/components/drive/service/drive_api_service.cc
+++ b/components/drive/service/drive_api_service.cc
@@ -73,11 +73,11 @@ namespace drive {
namespace {
// OAuth2 scopes for Drive API.
-const char kDriveScope[] = "https://www.9oo91eapis.qjz9zk/auth/drive";
+const char kDriveScope[] = "trk:217:https://www.9oo91eapis.qjz9zk/auth/drive";
const char kDriveAppsReadonlyScope[] =
- "https://www.9oo91eapis.qjz9zk/auth/drive.apps.readonly";
-const char kDriveAppsScope[] = "https://www.9oo91eapis.qjz9zk/auth/drive.apps";
-const char kDocsListScope[] = "https://docs.9oo91e.qjz9zk/feeds/";
+ "trk:218:https://www.9oo91eapis.qjz9zk/auth/drive.apps.readonly";
+const char kDriveAppsScope[] = "trk:219:https://www.9oo91eapis.qjz9zk/auth/drive.apps";
+const char kDocsListScope[] = "trk:135:https://docs.9oo91e.qjz9zk/feeds/";
// Mime type to create a directory.
const char kFolderMimeType[] = "application/vnd.google-apps.folder";
diff --git a/components/enhanced_bookmarks/bookmark_server_cluster_service.cc b/components/enhanced_bookmarks/bookmark_server_cluster_service.cc
index cf34176..f9a72f8 100644
--- a/components/enhanced_bookmarks/bookmark_server_cluster_service.cc
@@ -829,35 +767,6 @@ index e278177..6ec309b 100644
const int64_t kRetryDelayMinutes = 60;
diff --git a/components/gcm_driver/gcm_account_tracker.cc b/components/gcm_driver/gcm_account_tracker.cc
index 06c0866..1a2071a 100644
--- a/components/gcm_driver/gcm_account_tracker.cc
+++ b/components/gcm_driver/gcm_account_tracker.cc
@@ -23,9 +23,9 @@ namespace gcm {
namespace {
// Scopes needed by the OAuth2 access tokens.
-const char kGCMGroupServerScope[] = "https://www.9oo91eapis.qjz9zk/auth/gcm";
+const char kGCMGroupServerScope[] = "trk:230:https://www.9oo91eapis.qjz9zk/auth/gcm";
const char kGCMCheckinServerScope[] =
- "https://www.9oo91eapis.qjz9zk/auth/android_checkin";
+ "trk:231:https://www.9oo91eapis.qjz9zk/auth/android_checkin";
// Name of the GCM account tracker for the OAuth2TokenService.
const char kGCMAccountTrackerName[] = "gcm_account_tracker";
// Minimum token validity when sending to GCM groups server.
diff --git a/components/google/core/browser/google_url_tracker.cc b/components/google/core/browser/google_url_tracker.cc
index d71754a..c22d40e 100644
--- a/components/google/core/browser/google_url_tracker.cc
+++ b/components/google/core/browser/google_url_tracker.cc
@@ -34,7 +34,7 @@
* (So the naming problem was spotted, yet remains unfixed even today…)
*/
const char GoogleURLTracker::kDefaultGoogleHomepage[] =
- "https://www.9oo91e.qjz9zk/";
+ "trk:192:https://www.9oo91e.qjz9zk/";
const char GoogleURLTracker::kSearchDomainCheckURL[] =
/* trk:193: */ "https://www.9oo91e.qjz9zk/searchdomaincheck?format=domain&type=chrome";
diff --git a/components/history/core/browser/web_history_service.cc b/components/history/core/browser/web_history_service.cc
index 392db72..dc870da 100644
--- a/components/history/core/browser/web_history_service.cc
@@ -994,19 +903,6 @@ index 02853af..bc782ee 100644
GURL GetServerUrl() {
std::string server_url = variations::GetVariationParamValue(
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 6177916..3935520 100644
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -129,7 +129,7 @@
"google": {
"name": "Google",
"keyword": "9oo91e.qjz9zk",
- "favicon_url": "http://www.9oo91e.qjz9zk/favicon.ico",
+ "favicon_url": "trk:186:http://www.9oo91e.qjz9zk/favicon.ico",
"search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}{google:contextualSearchVersion}ie={inputEncoding}",
"suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
"instant_url": "{google:baseURL}webhp?sourceid=chrome-instant&{google:RLZ}{google:forceInstantResults}{google:instantExtendedEnabledParameter}ie={inputEncoding}",
diff --git a/components/translate/core/browser/translate_url_fetcher.cc b/components/translate/core/browser/translate_url_fetcher.cc
index 39c2b2c..70ab07e 100644
--- a/components/translate/core/browser/translate_url_fetcher.cc
@@ -1096,90 +992,6 @@ index 57162da..c2d5790 100644
UpdateManifest::Result::Result()
: size(0),
diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constants.cc
index d3d0cd9..91210c8 100644
--- a/google_apis/gaia/gaia_constants.cc
+++ b/google_apis/gaia/gaia_constants.cc
@@ -24,31 +24,31 @@ const char kSyncService[] = "chromiumsync";
const char kRemotingService[] = "chromoting";
// OAuth scopes.
-const char kOAuth1LoginScope[] = "https://www.9oo91e.qjz9zk/accounts/OAuthLogin";
+const char kOAuth1LoginScope[] = "trk:181:https://www.9oo91e.qjz9zk/accounts/OAuthLogin";
const char kOAuthWrapBridgeUserInfoScope[] =
- "https://www.9oo91eapis.qjz9zk/auth/userinfo.email";
+ "trk:101:https://www.9oo91eapis.qjz9zk/auth/userinfo.email";
// Service/scope names for device management (cloud-based policy) server.
const char kDeviceManagementServiceOAuth[] =
- "https://www.9oo91eapis.qjz9zk/auth/chromeosdevicemanagement";
+ "trk:102:https://www.9oo91eapis.qjz9zk/auth/chromeosdevicemanagement";
// OAuth2 scope for access to all Google APIs.
-const char kAnyApiOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/any-api";
+const char kAnyApiOAuth2Scope[] = "trk:103:https://www.9oo91eapis.qjz9zk/auth/any-api";
// OAuth2 scope for access to Chrome sync APIs
const char kChromeSyncOAuth2Scope[] =
- "https://www.9oo91eapis.qjz9zk/auth/chromesync";
+ "trk:104:https://www.9oo91eapis.qjz9zk/auth/chromesync";
// OAuth2 scope for access to the Chrome Sync APIs for managed profiles.
const char kChromeSyncSupervisedOAuth2Scope[] =
- "https://www.9oo91eapis.qjz9zk/auth/chromesync_playpen";
+ "trk:105:https://www.9oo91eapis.qjz9zk/auth/chromesync_playpen";
// OAuth2 scope for access to Google Talk APIs (XMPP).
const char kGoogleTalkOAuth2Scope[] =
- "https://www.9oo91eapis.qjz9zk/auth/googletalk";
+ "trk:106:https://www.9oo91eapis.qjz9zk/auth/googletalk";
const char kGoogleUserInfoEmail[] =
- "https://www.9oo91eapis.qjz9zk/auth/userinfo.email";
+ "trk:107:https://www.9oo91eapis.qjz9zk/auth/userinfo.email";
const char kGoogleUserInfoProfile[] =
- "https://www.9oo91eapis.qjz9zk/auth/userinfo.profile";
+ "trk:260:https://www.9oo91eapis.qjz9zk/auth/userinfo.profile";
// Used to mint uber auth tokens when needed.
const char kGaiaSid[] = "sid";
diff --git a/google_apis/gaia/google_service_auth_error.cc b/google_apis/gaia/google_service_auth_error.cc
index 76f4122..004e64f 100644
--- a/google_apis/gaia/google_service_auth_error.cc
+++ b/google_apis/gaia/google_service_auth_error.cc
@@ -238,7 +238,7 @@ std::string GoogleServiceAuthError::ToString() const {
case WEB_LOGIN_REQUIRED:
return "Less secure apps may not authenticate with this account. "
"Please visit: "
- "https://www.9oo91e.qjz9zk/settings/security/lesssecureapps";
+ "trk:180:https://www.9oo91e.qjz9zk/settings/security/lesssecureapps";
default:
NOTREACHED();
return std::string();
diff --git a/google_apis/gcm/engine/gservices_settings.cc b/google_apis/gcm/engine/gservices_settings.cc
index cde4d7fb..7813526 100644
--- a/google_apis/gcm/engine/gservices_settings.cc
+++ b/google_apis/gcm/engine/gservices_settings.cc
@@ -29,18 +29,18 @@ const char kRegistrationURLKey[] = "gcm_registration_url";
const int64_t kDefaultCheckinInterval = 2 * 24 * 60 * 60; // seconds = 2 days.
const int64_t kMinimumCheckinInterval = 12 * 60 * 60; // seconds = 12 hours.
-const char kDefaultCheckinURL[] = "https://android.clients.9oo91e.qjz9zk/checkin";
+const char kDefaultCheckinURL[] = "trk:110:https://android.clients.9oo91e.qjz9zk/checkin";
const char kDefaultMCSHostname[] = "mtalk.9oo91e.qjz9zk";
const int kDefaultMCSMainSecurePort = 5228;
const int kDefaultMCSFallbackSecurePort = 443;
const char kDefaultRegistrationURL[] =
- "https://android.clients.9oo91e.qjz9zk/c2dm/register3";
+ "trk:111:https://android.clients.9oo91e.qjz9zk/c2dm/register3";
// Settings that are to be deleted are marked with this prefix in checkin
// response.
const char kDeleteSettingPrefix[] = "delete_";
// Settings digest starts with verison number followed by '-'.
const char kDigestVersionPrefix[] = "1-";
-const char kMCSEnpointTemplate[] = "https://%s:%d";
+const char kMCSEnpointTemplate[] = "trk:112:https://%s:%d";
const int kMaxSecurePort = 65535;
std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) {
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
index 657fd3f..5fa47f5 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

46
patches/iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch
View File

@@ -1,46 +0,0 @@
From 7e3495487e05bb2f7ff3be3406a7196407d75b0d Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Mon, 1 Jun 2015 17:14:34 +0200
Subject: [PATCH 39/57] google-cloud-messaging: disable experiment status check
This avoids trk:263 from triggering.
---
components/gcm_driver/gcm_channel_status_request.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
index bafaee3..3167562 100644
--- a/components/gcm_driver/gcm_channel_status_request.cc
+++ b/components/gcm_driver/gcm_channel_status_request.cc
@@ -21,8 +21,10 @@ namespace gcm {
namespace {
+#if 0
const char kRequestContentType[] = "application/octet-stream";
const char kGCMChannelTag[] = "gcm_channel";
+#endif
const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes.
const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes.
@@ -55,6 +57,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
}
void GCMChannelStatusRequest::Start() {
+#if 0
DCHECK(!url_fetcher_.get());
GURL request_url(channel_status_request_url_);
@@ -74,6 +77,9 @@ void GCMChannelStatusRequest::Start() {
url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
net::LOAD_DO_NOT_SAVE_COOKIES);
url_fetcher_->Start();
+#endif
+ // Simulate an empty response and disable GCM.
+ callback_.Run(false, false, 0);
}
void GCMChannelStatusRequest::OnURLFetchComplete(
--
2.6.2

2
patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch
View File

@@ -566,7 +566,7 @@ diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/
index f5c2eeb..2a3e53f 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -67890,6 +67890,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
@@ -67920,6 +67920,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
<int value="57" label="READER_MODE_INFOBAR_DELEGATE"/>
<int value="58" label="SYNC_ERROR_INFOBAR_DELEGATE"/>
<int value="59" label="UPGRADE_INFOBAR_DELEGATE"/>

2
patches/patch_order
View File

@@ -25,7 +25,6 @@ iridium-browser/plugin-do-not-load-any-system-provided-plugins-on-Wi.patch
iridium-browser/plugin-only-load-plugins-from-user-s-domain-on-Mac-O.patch
iridium-browser/Remove-EV-certificates.patch
iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch
iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch
iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch
iridium-browser/updater-disable-updater-pings.patch
iridium-browser/safe_browsing-disable-incident-reporting.patch
@@ -54,7 +53,6 @@ debian/webui.patch
inox-patchset/disable-autofill-download-manager.patch
inox-patchset/disable-default-extensions.patch
inox-patchset/disable-first-run-behaviour.patch
inox-patchset/disable-google-url-tracker.patch
inox-patchset/disable-new-avatar-menu.patch
inox-patchset/disable-translation-lang-fetch.patch
inox-patchset/modify-default-prefs.patch

36
source_cleaner.sh
View File

@@ -3,7 +3,39 @@
# Delete all binary files marked as executables
find . -path ./debian -prune -o -path ./third_party/icu/source -prune -o -path ./third_party/liblouis/src/tables -prune -o -path ./components/dom_distiller/core/data/distillable_page_model.bin -prune -o -path ./components/dom_distiller/core/data/distillable_page_model_new.bin -prune -o -path ./third_party/skia/resources -prune -o -path ./third_party/deqp/src/data -prune -o -type f -not \( -empty \) -not \( -name "*.ttf" -o -name "*.png" -o -name "*.jpg" -o -name "*.webp" -o -name "*.gif" -o -name "*.ico" -o -name "*.mp3" -o -name "*.wav" -o -name "*.icns" -o -name "*.woff" -o -name "*.woff2" -o -name "*Makefile" -o -name "*makefile" -o -name "*.xcf" -o -name "*.cur" -o -name "*.pdf" -o -name "*.ai" -o -name "*.h" -o -name "*.c" -o -name "*.cpp" -o -name "*.cc" -o -name "*.mk" -o -name "*.bmp" -o -name "*.py" -o -name "*.xml" -o -name "*.html" -o -name "*.js" -o -name "*.json" -o -name "*.txt" -o -name "*.TXT" \) -not \( -exec grep -Iq . {} \; \) -print | xargs -L1 -I{} rm {}
# Remove existing out/ directory
rm -r ./out
# Remove some unnecessary google code
rm -r ./google_apis
rm -r ./google_update
rm -r ./components/browser_sync
rm ./components/browser_sync.gypi
rm ./components/browser_sync_strings.grdp
rm -r ./components/cloud_devices
rm ./components/cloud_devices.gypi
rm -r ./components/copresence
rm ./components/copresence.gypi
rm -r ./components/drive
rm ./components/drive.gypi
rm -r ./components/gcm_driver
rm ./components/gcm_driver.gypi
rm -r ./components/google
rm ./components/google.gypi
rm -r ./components/search
rm ./components/search.gypi
rm -r ./components/search_engines
rm ./components/search_engines.gypi
rm -r ./components/search_provider_logos
rm ./components/search_provider_logos.gypi
rm -r ./components/signin
rm ./components/signin.gypi
exit 0;