| Index: chrome/test/base/chrome_render_view_test.cc
|
| diff --git a/chrome/test/base/chrome_render_view_test.cc b/chrome/test/base/chrome_render_view_test.cc
|
| index 94eb0274ecd31480288eaa51bf75a4d9f02c895d..1e3cb364115417cca4fb1824965c91da0ca38ed2 100644
|
| --- a/chrome/test/base/chrome_render_view_test.cc
|
| +++ b/chrome/test/base/chrome_render_view_test.cc
|
| @@ -20,6 +20,7 @@
|
| #include "content/public/browser/native_web_keyboard_event.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| #include "content/public/renderer/render_view.h"
|
| +#include "extensions/features/features.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "third_party/WebKit/public/platform/WebURLRequest.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| @@ -29,7 +30,7 @@
|
| #include "third_party/WebKit/public/web/WebScriptSource.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
|
|
| -#if defined(ENABLE_EXTENSIONS)
|
| +#if BUILDFLAG(ENABLE_EXTENSIONS)
|
| #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
|
| #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h"
|
| #include "extensions/browser/extension_function_dispatcher.h"
|
| @@ -128,7 +129,7 @@ void ChromeRenderViewTest::SetUp() {
|
|
|
| void ChromeRenderViewTest::TearDown() {
|
| base::RunLoop().RunUntilIdle();
|
| -#if defined(ENABLE_EXTENSIONS)
|
| +#if BUILDFLAG(ENABLE_EXTENSIONS)
|
| ChromeExtensionsRendererClient* ext_client =
|
| ChromeExtensionsRendererClient::GetInstance();
|
| ext_client->GetExtensionDispatcherForTest()->OnRenderProcessShutdown();
|
| @@ -162,7 +163,7 @@ void ChromeRenderViewTest::RegisterMainFrameRemoteInterfaces() {}
|
|
|
| void ChromeRenderViewTest::InitChromeContentRendererClient(
|
| ChromeContentRendererClient* client) {
|
| -#if defined(ENABLE_EXTENSIONS)
|
| +#if BUILDFLAG(ENABLE_EXTENSIONS)
|
| extension_dispatcher_delegate_.reset(
|
| new ChromeExtensionsDispatcherDelegate());
|
| ChromeExtensionsRendererClient* ext_client =
|
|
|