| Index: content/browser/site_per_process_browsertest.cc
|
| diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
|
| index 7a2ab8a27d39c65c81c59a9430f4295133e96817..9d2a95b9c413b5f5eccd3305c357aa3390150b49 100644
|
| --- a/content/browser/site_per_process_browsertest.cc
|
| +++ b/content/browser/site_per_process_browsertest.cc
|
| @@ -4,17 +4,22 @@
|
|
|
| #include "content/browser/site_per_process_browsertest.h"
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <algorithm>
|
| #include <vector>
|
|
|
| #include "base/command_line.h"
|
| #include "base/location.h"
|
| +#include "base/macros.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/pattern.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/test/test_timeouts.h"
|
| #include "base/thread_task_runner_handle.h"
|
| +#include "build/build_config.h"
|
| #include "content/browser/frame_host/cross_process_frame_connector.h"
|
| #include "content/browser/frame_host/frame_tree.h"
|
| #include "content/browser/frame_host/navigator.h"
|
| @@ -451,9 +456,9 @@ class ConsoleObserverDelegate : public WebContentsDelegate {
|
| ~ConsoleObserverDelegate() override {}
|
|
|
| bool AddMessageToConsole(WebContents* source,
|
| - int32 level,
|
| + int32_t level,
|
| const base::string16& message,
|
| - int32 line_no,
|
| + int32_t line_no,
|
| const base::string16& source_id) override;
|
|
|
| std::string message() { return message_; }
|
| @@ -477,9 +482,9 @@ void ConsoleObserverDelegate::Wait() {
|
|
|
| bool ConsoleObserverDelegate::AddMessageToConsole(
|
| WebContents* source,
|
| - int32 level,
|
| + int32_t level,
|
| const base::string16& message,
|
| - int32 line_no,
|
| + int32_t line_no,
|
| const base::string16& source_id) {
|
| DCHECK(source == web_contents_);
|
|
|
|
|