Index: content/shell/app/shell_main_delegate.cc |
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc |
index b0fbabb2c3508f187617bbac907e5ace8ab5c1be..98945403b2c866943ca26d7b5e2248a65c2112a9 100644 |
--- a/content/shell/app/shell_main_delegate.cc |
+++ b/content/shell/app/shell_main_delegate.cc |
@@ -17,8 +17,8 @@ |
#include "content/public/common/content_switches.h" |
#include "content/public/common/url_constants.h" |
#include "content/public/test/layouttest_support.h" |
+#include "content/shell/app/blink_test_platform_support.h" |
#include "content/shell/app/shell_crash_reporter_client.h" |
-#include "content/shell/app/webkit_test_platform_support.h" |
#include "content/shell/browser/shell_browser_main.h" |
#include "content/shell/browser/shell_content_browser_client.h" |
#include "content/shell/common/shell_switches.h" |
@@ -56,8 +56,8 @@ |
#endif // OS_MACOSX |
#if defined(OS_WIN) |
-#include <initguid.h> |
#include <windows.h> |
Avi (use Gerrit)
2014/10/15 22:42:27
Why this change?
tfarina
2014/10/15 22:44:28
ops, that was not intended, will revert.
tfarina
2014/10/15 22:47:53
Done.
tfarina
2014/10/15 22:47:53
Done.
|
+#include <initguid.h> |
#include "base/logging_win.h" |
#include "components/crash/app/breakpad_win.h" |
#include "content/shell/common/v8_breakpad_support_win.h" |
@@ -120,7 +120,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
#endif |
#if defined(OS_MACOSX) |
// Needs to happen before InitializeResourceBundle() and before |
- // WebKitTestPlatformInitialize() are called. |
+ // BlinkTestPlatformInitialize() are called. |
OverrideFrameworkBundlePath(); |
OverrideChildProcessPath(); |
EnsureCorrectResolutionSettings(); |
@@ -130,7 +130,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
if (command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)) { |
// If CheckLayoutSystemDeps succeeds, we don't exit early. Instead we |
- // continue and try to load the fonts in WebKitTestPlatformInitialize |
+ // continue and try to load the fonts in BlinkTestPlatformInitialize |
// below, and then try to bring up the rest of the content module. |
if (!CheckLayoutSystemDeps()) { |
if (exit_code) |
@@ -189,7 +189,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
net::RemoveProprietaryMediaTypesAndCodecsForTests(); |
#endif |
- if (!WebKitTestPlatformInitialize()) { |
+ if (!BlinkTestPlatformInitialize()) { |
if (exit_code) |
*exit_code = 1; |
return true; |