Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2798)

Unified Diff: android_webview/lib/main/webview_main_delegate.cc

Issue 10855171: Add a test runner for android_webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/lib/aw_content_browser_client.cc ('k') | android_webview/native/android_web_view_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/lib/main/webview_main_delegate.cc
diff --git a/android_webview/lib/main/webview_main_delegate.cc b/android_webview/lib/main/webview_main_delegate.cc
index 9ff742a15ddc5a88dca073098b2293498bcfd541..3e054638f4c5b54c612b98168c68aff0770abbb5 100644
--- a/android_webview/lib/main/webview_main_delegate.cc
+++ b/android_webview/lib/main/webview_main_delegate.cc
@@ -4,9 +4,10 @@
#include "android_webview/lib/main/webview_main_delegate.h"
+#include "android_webview/lib/aw_browser_dependency_factory_impl.h"
+#include "android_webview/lib/aw_content_browser_client.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/renderer/chrome_content_renderer_client.h"
#include "content/public/browser/browser_main_runner.h"
@@ -14,7 +15,7 @@
namespace android_webview {
-base::LazyInstance<chrome::ChromeContentBrowserClient>
+base::LazyInstance<AwContentBrowserClient>
g_webview_content_browser_client = LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<chrome::ChromeContentRendererClient>
g_webview_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
@@ -46,6 +47,8 @@ int WebViewMainDelegate::RunProcess(
const std::string& process_type,
const content::MainFunctionParams& main_function_params) {
if (process_type.empty()) {
+ AwBrowserDependencyFactoryImpl::InstallInstance();
+
browser_runner_.reset(content::BrowserMainRunner::Create());
int exit_code = browser_runner_->Initialize(main_function_params);
DCHECK(exit_code < 0);
« no previous file with comments | « android_webview/lib/aw_content_browser_client.cc ('k') | android_webview/native/android_web_view_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698