| Index: chrome/renderer/chrome_render_process_observer.cc
|
| diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
|
| index a346ae6afc16371620a5aab0b305200c2bbfc4ef..970e89af4d1b862db58b9bad35eff8015222e876 100644
|
| --- a/chrome/renderer/chrome_render_process_observer.cc
|
| +++ b/chrome/renderer/chrome_render_process_observer.cc
|
| @@ -30,18 +30,18 @@
|
| #include "media/base/media_switches.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/net_module.h"
|
| -#include "third_party/sqlite/sqlite3.h"
|
| -#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
|
| +#include "third_party/sqlite/sqlite3.h"
|
| +#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
|
| #include "v8/include/v8.h"
|
|
|
| #if defined(OS_WIN)
|
| -#include "app/win/iat_patch_function.h"
|
| +#include "base/win/iat_patch_function.h"
|
| #endif
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -132,7 +132,7 @@ class RenderViewContentSettingsSetter : public RenderViewVisitor {
|
| };
|
|
|
| #if defined(OS_WIN)
|
| -static app::win::IATPatchFunction g_iat_patch_createdca;
|
| +static base::win::IATPatchFunction g_iat_patch_createdca;
|
| HDC WINAPI CreateDCAPatch(LPCSTR driver_name,
|
| LPCSTR device_name,
|
| LPCSTR output,
|
| @@ -146,7 +146,7 @@ HDC WINAPI CreateDCAPatch(LPCSTR driver_name,
|
| return CreateCompatibleDC(NULL);
|
| }
|
|
|
| -static app::win::IATPatchFunction g_iat_patch_get_font_data;
|
| +static base::win::IATPatchFunction g_iat_patch_get_font_data;
|
| DWORD WINAPI GetFontDataPatch(HDC hdc,
|
| DWORD table,
|
| DWORD offset,
|
|
|