fixes for chromium59

brave · May 31, 2017 · 670f4c5 · 670f4c5
1 parent 71eaf07
commit 670f4c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/brave/browser/extensions/api/storage/managed_storage_api.cc b/brave/browser/extensions/api/storage/managed_storage_api.cc
@@ -45,25 +45,25 @@ ExtensionFunction::ResponseValue ManagedStorageSetFunction::UseWriteResult(
 }
 
 bool ManagedStorageSetFunction::PreRunValidation(std::string* error) {
-  std::unique_ptr<base::StringValue> val(new base::StringValue("managed"));
+  std::unique_ptr<base::Value> val(new base::Value("managed"));
   args_->Insert(0, std::move(val));
   return StorageStorageAreaSetFunction::PreRunValidation(error);
 }
 
 bool ManagedStorageGetFunction::PreRunValidation(std::string* error) {
-  std::unique_ptr<base::StringValue> val(new base::StringValue("managed"));
+  std::unique_ptr<base::Value> val(new base::Value("managed"));
   args_->Insert(0, std::move(val));
   return StorageStorageAreaGetFunction::PreRunValidation(error);
 }
 
 bool ManagedStorageRemoveFunction::PreRunValidation(std::string* error) {
-  std::unique_ptr<base::StringValue> val(new base::StringValue("managed"));
+  std::unique_ptr<base::Value> val(new base::Value("managed"));
   args_->Insert(0, std::move(val));
   return StorageStorageAreaRemoveFunction::PreRunValidation(error);
 }
 
 bool ManagedStorageClearFunction::PreRunValidation(std::string* error) {
-  std::unique_ptr<base::StringValue> val(new base::StringValue("managed"));
+  std::unique_ptr<base::Value> val(new base::Value("managed"));
   args_->Insert(0, std::move(val));
   return StorageStorageAreaClearFunction::PreRunValidation(error);
 }

diff --git a/brave/browser/fake_render_process_host.cc b/brave/browser/fake_render_process_host.cc
@@ -90,9 +90,11 @@ class FakeRenderThread : public RenderThread {
   service_manager::InterfaceRegistry* GetInterfaceRegistry() override {
     return nullptr;
   }
-  service_manager::InterfaceProvider* GetRemoteInterfaces() override {
+  service_manager::Connector* GetConnector() override {
     return nullptr;
   }
+  void SetFieldTrialGroup(const std::string& trial_name,
+                                  const std::string& group_name) override {}
 
  private:
   FakeRenderProcessHost* host_;

diff --git a/brave/browser/fake_render_process_host.h b/brave/browser/fake_render_process_host.h
@@ -71,6 +71,12 @@ class FakeRenderProcessHost : public content::RenderProcessHost {
     return init_time_ - init_time_;
   }
   void FilterURL(bool empty_allowed, GURL* url) override {}
+  void AddWidget(content::RenderWidgetHost* widget) override {}
+  void RemoveWidget(content::RenderWidgetHost* widget) override {}
+  void SetEchoCanceller3(bool enable) override {}
+  void BindInterface(const std::string& interface_name,
+                      mojo::ScopedMessagePipeHandle interface_pipe) override {}
+
 #if BUILDFLAG(ENABLE_WEBRTC)
   void EnableAudioDebugRecordings(const base::FilePath& file) override {}
   void DisableAudioDebugRecordings() override {}
@@ -91,9 +97,6 @@ class FakeRenderProcessHost : public content::RenderProcessHost {
   void GetAudioOutputControllers(
       const GetAudioOutputControllersCallback& callback) const override;
   void ResumeDeferredNavigation(const GlobalRequestID& request_id) override {}
-  service_manager::InterfaceProvider* GetRemoteInterfaces() override {
-    return nullptr;
-  }
   std::unique_ptr<base::SharedPersistentMemoryAllocator>
   TakeMetricsAllocator() override { return nullptr; }
   const base::TimeTicks& GetInitTimeForNavigationMetrics() const override {