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

Unified Diff: blimp/engine/testing/app/blimp_browser_testing_main_parts.cc

Issue 2572563006: [Blimp] Refactor Blimp test engine with embedded test server and URL rewriting (Closed)
Patch Set: Created 4 years 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
Index: blimp/engine/testing/app/blimp_browser_testing_main_parts.cc
diff --git a/blimp/engine/app/blimp_browser_main_parts.cc b/blimp/engine/testing/app/blimp_browser_testing_main_parts.cc
similarity index 56%
copy from blimp/engine/app/blimp_browser_main_parts.cc
copy to blimp/engine/testing/app/blimp_browser_testing_main_parts.cc
index 32e405c65a1a240f452c0349c779a5dab668035a..e0e09ff9410edce7dca1b23bdfbd3ffc932a7ed4 100644
--- a/blimp/engine/app/blimp_browser_main_parts.cc
+++ b/blimp/engine/testing/app/blimp_browser_testing_main_parts.cc
@@ -1,8 +1,8 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "blimp/engine/app/blimp_browser_main_parts.h"
+#include "blimp/engine/testing/app/blimp_browser_testing_main_parts.h"
#include <utility>
@@ -15,6 +15,7 @@
#include "blimp/engine/common/blimp_browser_context.h"
#include "blimp/engine/feature/geolocation/blimp_location_provider.h"
#include "blimp/engine/session/blimp_engine_session.h"
+#include "blimp/engine/testing/session/blimp_engine_testing_session.h"
#include "blimp/net/blimp_connection.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/main_function_params.h"
@@ -24,12 +25,11 @@
namespace blimp {
namespace engine {
-BlimpBrowserMainParts::BlimpBrowserMainParts(
- const content::MainFunctionParams& parameters) {}
+BlimpBrowserTestingMainParts::BlimpBrowserTestingMainParts(
+ const content::MainFunctionParams& parameters)
+ : BlimpBrowserMainParts(parameters){};
-BlimpBrowserMainParts::~BlimpBrowserMainParts() {}
-
-void BlimpBrowserMainParts::PreEarlyInitialization() {
+void BlimpBrowserTestingMainParts::PreEarlyInitialization() {
// Fetch the engine config from the command line, and crash if invalid. Allow
// IO operations even though this is not in the FILE thread as this is
// necessary for Blimp startup and occurs before any user interaction.
@@ -41,39 +41,18 @@ void BlimpBrowserMainParts::PreEarlyInitialization() {
}
}
-void BlimpBrowserMainParts::PreMainMessageLoopRun() {
+void BlimpBrowserTestingMainParts::PreMainMessageLoopRun() {
net_log_.reset(new net::NetLog());
settings_manager_.reset(new SettingsManager);
std::unique_ptr<BlimpBrowserContext> browser_context(
new BlimpBrowserContext(false, net_log_.get()));
- engine_session_.reset(
- new BlimpEngineSession(std::move(browser_context), net_log_.get(),
- engine_config_.get(), settings_manager_.get()));
+ engine_session_.reset(new BlimpEngineTestingSession(
+ std::move(browser_context), net_log_.get(), engine_config_.get(),
+ settings_manager_.get()));
engine_session_->Initialize();
-}
-
-void BlimpBrowserMainParts::PostMainMessageLoopRun() {
- engine_session_.reset();
-}
-
-BlimpBrowserContext* BlimpBrowserMainParts::GetBrowserContext() {
- return engine_session_->browser_context();
-}
-
-SettingsManager* BlimpBrowserMainParts::GetSettingsManager() {
- return settings_manager_.get();
-}
-
-BlobChannelSender* BlimpBrowserMainParts::GetBlobChannelSender() {
- return engine_session_->blob_channel_sender();
-}
-
-BlobChannelService* BlimpBrowserMainParts::GetBlobChannelService() {
- return engine_session_->GetBlobChannelService();
-}
-
-BlimpEngineSession* BlimpBrowserMainParts::GetBlimpEngineSession() {
- return engine_session_.get();
+ BlimpBrowserMainParts::SetSettingsManagerForTesting(
+ std::move(settings_manager_));
+ BlimpBrowserMainParts::SetEngineSessionForTesting(std::move(engine_session_));
}
} // namespace engine

Powered by Google App Engine
This is Rietveld 408576698