fixup! rebase to Chromium 75

rogerwang · rogerwang · commit d3951318bd27 · 2019-05-05T03:09:27.000-06:00
diff --git a/src/browser/menubar_view.cc b/src/browser/menubar_view.cc
@@ -96,9 +96,9 @@ bool MenuBarView::GetMenuButtonAtLocation(const gfx::Point& loc, ui::MenuModel**
   return false;
 }
 
-void MenuBarView::OnMenuButtonClicked(views::MenuButton* view,
-                                          const gfx::Point& point,
-                                          const ui::Event* event) {
+void MenuBarView::OnMenuButtonClicked(views::Button* view,
+                                      const gfx::Point& point,
+                                      const ui::Event* event) {
   int button_index = GetIndexOf(view);
   DCHECK_NE(-1, button_index);
   ui::MenuModel::ItemType type = model_->GetTypeAt(button_index);
diff --git a/src/browser/menubar_view.h b/src/browser/menubar_view.h
@@ -49,7 +49,7 @@ class MenuBarView :
   bool GetMenuButtonAtLocation(const gfx::Point& loc, ui::MenuModel** model, views::MenuButton** button);
 
   // views::MenuButtonListener:
-  void OnMenuButtonClicked(views::MenuButton* source,
+  void OnMenuButtonClicked(views::Button* source,
                            const gfx::Point& point,
                            const ui::Event* event) override;
 
diff --git a/src/browser/nw_extensions_browser_hooks.cc b/src/browser/nw_extensions_browser_hooks.cc
@@ -266,7 +266,7 @@ void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest,
     if (GetPackageImage(package, base::FilePath::FromUTF8Unsafe(icon_path), &app_icon)) {
       SetAppIcon(app_icon);
       int width = app_icon.Width();
-      std::string key = "icons." + base::IntToString(width);
+      std::string key = "icons." + base::NumberToString(width);
       manifest->SetString(key, icon_path);
 #if defined(OS_WIN)
       SetWindowHIcon((IconUtil::CreateHICONFromSkBitmapSizedTo(*app_icon.AsImageSkia().bitmap(),
diff --git a/src/nwjs_browsertest.cc b/src/nwjs_browsertest.cc
@@ -394,11 +394,11 @@ class MockDownloadWebContentsDelegate : public content::WebContentsDelegate {
 
   void CanDownload(const GURL& url,
                    const std::string& request_method,
-                   const base::Callback<void(bool)>& callback) override {
+                   base::OnceCallback<void(bool)> callback) override {
     orig_delegate_->CanDownload(
         url, request_method,
-        base::Bind(&MockDownloadWebContentsDelegate::DownloadDecided,
-                   base::Unretained(this), callback));
+        base::BindOnce(&MockDownloadWebContentsDelegate::DownloadDecided,
+                       base::Unretained(this), std::move(callback)));
   }
 
   void WaitForCanDownload(bool expect_allow) {
@@ -415,19 +415,19 @@ class MockDownloadWebContentsDelegate : public content::WebContentsDelegate {
     message_loop_runner_->Run();
   }
 
-  void DownloadDecided(const base::Callback<void(bool)>& callback, bool allow) {
+  void DownloadDecided(base::OnceCallback<void(bool)> callback, bool allow) {
     EXPECT_FALSE(decision_made_);
     decision_made_ = true;
 
     if (waiting_for_decision_) {
       EXPECT_EQ(expect_allow_, allow);
       if (message_loop_runner_.get())
         message_loop_runner_->Quit();
-      callback.Run(allow);
+      std::move(callback).Run(allow);
       return;
     }
     last_download_allowed_ = allow;
-    callback.Run(allow);
+    std::move(callback).Run(allow);
   }
 
   void Reset() {
@@ -1212,7 +1212,7 @@ class NWJSDesktopCaptureApiTest : public NWAppTest {
 
  protected:
   GURL GetURLForPath(const std::string& host, const std::string& path) {
-    std::string port = base::UintToString(embedded_test_server()->port());
+    std::string port = base::NumberToString(embedded_test_server()->port());
     GURL::Replacements replacements;
     replacements.SetHostStr(host);
     replacements.SetPortStr(port);
diff --git a/src/policy_cert_verifier.h b/src/policy_cert_verifier.h
@@ -12,7 +12,6 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/completion_callback.h"
 #include "net/cert/cert_verifier.h"
 
 namespace net {
diff --git a/src/renderer/nw_extensions_renderer_hooks.cc b/src/renderer/nw_extensions_renderer_hooks.cc
@@ -129,13 +129,13 @@ const char* GetChromiumVersion();
 
 // renderer
 
-void WebWorkerNewThreadHook(const char* name, base::Thread::Options* options) {
+void WebWorkerNewThreadHook(const char* name, bool* is_node) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (!command_line.HasSwitch(switches::kEnableNodeWorker))
     return;
   if (!strcmp(name, "DedicatedWorker thread") || !strcmp(name, "SharedWorker thread"))
-    options->message_loop_type = base::MessageLoop::TYPE_NODE;
+    *is_node = true;
 }
 
 void WebWorkerStartThreadHook(blink::Frame* frame, const char* path, std::string* script, bool* isNodeJS) {
