[CodeInclusion] Rename master->main in safe_browsing

Bug: 1160263
Change-Id: I7712b046ebe6533451260bcd425ccb00300912b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2597462
Commit-Queue: Josh Karlin <jkarlin@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842061}

chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc

@@ -85,11 +85,11 @@ class SettingsResetter : public base::RefCounted<SettingsResetter> {
   friend class base::RefCounted<SettingsResetter>;
 
   // Resets settings for |profile| according to default values given by
-  // |master_settings|. Used as a callback for
+  // |main_settings|. Used as a callback for
   // DefaultSettingsFetcher::FetchDefaultSettings().
   void OnFetchCompleted(
       Profile* profile,
-      std::unique_ptr<BrandcodedDefaultSettings> master_settings);
+      std::unique_ptr<BrandcodedDefaultSettings> main_settings);
 
   // Removes the settings reset tag for |profile|. If there are no more
   // profiles to reset, invokes |done_callback_| and deletes this object.
@@ -146,7 +146,7 @@ void SettingsResetter::Run() {
 
 void SettingsResetter::OnFetchCompleted(
     Profile* profile,
-    std::unique_ptr<BrandcodedDefaultSettings> master_settings) {
+    std::unique_ptr<BrandcodedDefaultSettings> main_settings) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   static const ProfileResetter::ResettableFlags kSettingsToReset =
@@ -156,7 +156,7 @@ void SettingsResetter::OnFetchCompleted(
 
   profile_resetters_.push_back(delegate_->GetProfileResetter(profile));
   profile_resetters_.back()->Reset(
-      kSettingsToReset, std::move(master_settings),
+      kSettingsToReset, std::move(main_settings),
       base::BindOnce(&SettingsResetter::OnResetCompleted, this, profile));
 }
 

chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc

@@ -32,9 +32,9 @@ MockProfileResetter::~MockProfileResetter() {}
 
 void MockProfileResetter::Reset(
     ProfileResetter::ResettableFlags resettable_flags,
-    std::unique_ptr<BrandcodedDefaultSettings> master_settings,
+    std::unique_ptr<BrandcodedDefaultSettings> main_settings,
     base::OnceClosure callback) {
-  MockReset(resettable_flags, master_settings.get(), base::OnceClosure());
+  MockReset(resettable_flags, main_settings.get(), base::OnceClosure());
   std::move(callback).Run();
 }
 

chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h

@@ -40,12 +40,12 @@ class MockProfileResetter : public ProfileResetter {
   // After the call to |MockReset()|, will call |callback.Run()| to simulate the
   // real |ProfileResetter|'s behaviour.
   void Reset(ProfileResetter::ResettableFlags resettable_flags,
-             std::unique_ptr<BrandcodedDefaultSettings> master_settings,
+             std::unique_ptr<BrandcodedDefaultSettings> main_settings,
              base::OnceClosure callback) override;
 
   MOCK_METHOD3(MockReset,
                void(ProfileResetter::ResettableFlags resettable_flags,
-                    BrandcodedDefaultSettings* master_settings,
+                    BrandcodedDefaultSettings* main_settings,
                     base::OnceClosure callback));
   MOCK_CONST_METHOD0(IsActive, bool());
 };

chrome/test/data/safe_browsing/mach_o/Makefile

@@ -2,11 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-KEYCHAIN_PASSWORD=g0atMaster
 # This must match the commonName in codesign.cfg.
 KEYCHAIN_IDENTITY=untrusted@goat.local
 
-# Funcitons to add and remove codesigning identity to user's keychain. These
+# Functions to add and remove codesigning identity to user's keychain. These
 # are necessary since the codesign utility no longer supports the -k option,
 # which reads the identity from a file.
 pre-build = security import codesign.key && security import codesign.crt

chrome/utility/safe_browsing/mac/udif.cc

@@ -77,7 +77,7 @@ struct UDIFResourceFile {
 
   uint8_t  reserved2[40];
 
-  UDIFChecksum master_checksum;
+  UDIFChecksum main_checksum;
 
   uint32_t image_variant;
   uint64_t sector_count;
@@ -109,7 +109,7 @@ static void ConvertBigEndian(UDIFResourceFile* file) {
   ConvertBigEndian(&file->plist_length);
   ConvertBigEndian(&file->code_signature_offset);
   ConvertBigEndian(&file->code_signature_length);
-  ConvertBigEndian(&file->master_checksum);
+  ConvertBigEndian(&file->main_checksum);
   ConvertBigEndian(&file->image_variant);
   ConvertBigEndian(&file->sector_count);
   // Reserved fields are skipped.