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

Unified Diff: components/web_view/web_view_apptest.cc

Issue 1340983002: Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated all the namespaces in mus Created 5 years, 3 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
Index: components/web_view/web_view_apptest.cc
diff --git a/components/web_view/web_view_apptest.cc b/components/web_view/web_view_apptest.cc
index 440d80c68f0da3c03e76d91694b7da01041458c3..29250f1865b67f69c00fd6acc237cdb27a81594e 100644
--- a/components/web_view/web_view_apptest.cc
+++ b/components/web_view/web_view_apptest.cc
@@ -11,7 +11,7 @@
#include "base/path_service.h"
#include "base/run_loop.h"
#include "components/mus/public/cpp/scoped_view_ptr.h"
-#include "components/mus/public/cpp/tests/view_manager_test_base.h"
+#include "components/mus/public/cpp/tests/mandoline_ui_services_test_base.h"
#include "components/mus/public/cpp/view.h"
#include "components/mus/public/cpp/view_tree_connection.h"
#include "mojo/util/filename_util.h"
@@ -28,7 +28,7 @@ const char kTestThreeFile[] = "test_three.html";
const char kTestThreeTitle[] = "Test Title Three";
}
-class WebViewTest : public mojo::ViewManagerTestBase,
+class WebViewTest : public mus::MandolineUIServicesTestBase,
public mojom::WebViewClient {
public:
WebViewTest() : web_view_(this) {}
@@ -70,24 +70,24 @@ class WebViewTest : public mojo::ViewManagerTestBase,
// Overridden from ApplicationDelegate:
void Initialize(mojo::ApplicationImpl* app) override {
- ViewManagerTestBase::Initialize(app);
+ MandolineUIServicesTestBase::Initialize(app);
app_ = app;
}
// Overridden from ViewTreeDelegate:
- void OnEmbed(mojo::View* root) override {
+ void OnEmbed(mus::View* root) override {
content_ = root->connection()->CreateView();
root->AddChild(content_);
content_->SetVisible(true);
web_view_.Init(app_, content_);
- ViewManagerTestBase::OnEmbed(root);
+ MandolineUIServicesTestBase::OnEmbed(root);
}
void TearDown() override {
- mojo::ScopedViewPtr::DeleteViewOrViewManager(window_manager()->GetRoot());
- ViewManagerTestBase::TearDown();
+ mus::ScopedViewPtr::DeleteViewOrViewManager(window_manager()->GetRoot());
+ MandolineUIServicesTestBase::TearDown();
}
// Overridden from web_view::mojom::WebViewClient:
@@ -108,7 +108,7 @@ class WebViewTest : public mojo::ViewManagerTestBase,
mojo::ApplicationImpl* app_;
- mojo::View* content_;
+ mus::View* content_;
web_view::WebView web_view_;

Powered by Google App Engine
This is Rietveld 408576698