From f3d07e6bb82ac097073f510d6e27f31cfaa62854 Mon Sep 17 00:00:00 2001
From: Pranjal Jumde <pranjal@brave.com>
Date: Tue, 2 Jan 2018 11:02:31 -0800
Subject: [PATCH] update

---
 patches/master_patch.patch | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/patches/master_patch.patch b/patches/master_patch.patch
index 5a3e6e58d2..6b7509703e 100644
--- a/patches/master_patch.patch
+++ b/patches/master_patch.patch
@@ -509,6 +509,19 @@ index 7ee1ec91e6ecb8cd9e237f0e67063ed704566ea6..9198607c50f23d7757016dcfb7526993
    // Finds TabStripModel which has a WebContents whose id is the given
    // web_contents_id, and returns the WebContents index and the TabStripModel.
    int FindTabStripModelById(int64_t target_web_contents_id,
+diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
+index b30ec89669e6734f1f319d49ac2568858685a30f..6a7808dda31e6caab55fe8417ef9f566ba8b28cc 100644
+--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
++++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
+@@ -82,7 +82,7 @@ SafeBrowsingServiceFactory* SafeBrowsingService::factory_ = NULL;
+ class SafeBrowsingServiceFactoryImpl : public SafeBrowsingServiceFactory {
+  public:
+   SafeBrowsingService* CreateSafeBrowsingService() override {
+-    return new SafeBrowsingService(V4FeatureList::GetV4UsageStatus());
++    return new SafeBrowsingService(V4FeatureList::V4UsageStatus::V4_INSTANTIATED);
+   }
+ 
+  private:
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 index 476a165dd2b1f4d724c3b2a5d8fd30b994d1dd05..d9dd99e293a4adcd357927023f38f289718bdfad 100644
 --- a/chrome/common/BUILD.gn
@@ -1814,6 +1827,19 @@ index bf0ece1e723ba1a0644961cfd3a01ce3c14c892a..5e7d3dbb9da51a5abb0447bc04c90c9b
                                    HolderIsFirstArgument);
    }
    static void SetAsFunctionHandler(v8::Isolate* isolate,
+diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc
+index 2e8437ed136e682540835ef4738e3519f9cb6051..4ec8bd06b4ee76a398947540c76e2450ed4cdcca 100644
+--- a/google_apis/google_api_keys.cc
++++ b/google_apis/google_api_keys.cc
+@@ -28,7 +28,7 @@
+ 
+ // Used to indicate an unset key/id/secret.  This works better with
+ // various unit tests than leaving the token empty.
+-#define DUMMY_API_TOKEN "dummytoken"
++#define DUMMY_API_TOKEN "AIzaSyAH90V94EcZBP5oH7oc-mXQrSKgASVxER8"
+ 
+ #if !defined(GOOGLE_API_KEY)
+ #define GOOGLE_API_KEY DUMMY_API_TOKEN
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 index f1a096e649290ef2e2ce2cc30891f547a6dc196f..1338eb43287476a108454e316dbfb853c000f1b4 100644
 --- a/media/base/media_switches.cc