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

Unified Diff: content/browser/mojo_shell_browsertest.cc

Issue 1737933002: mojo leveldb: Get profile and leveldb connected to DOMStorageContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add OWNERS file by request. Created 4 years, 9 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: content/browser/mojo_shell_browsertest.cc
diff --git a/content/browser/mojo_shell_browsertest.cc b/content/browser/mojo_shell_browsertest.cc
index 5e9eac1e313538e44f8c59473ae6b69439c3c481..38f62545b764f1e65b58951abcee85f7383ef1f3 100644
--- a/content/browser/mojo_shell_browsertest.cc
+++ b/content/browser/mojo_shell_browsertest.cc
@@ -7,10 +7,13 @@
#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "content/browser/mojo/mojo_shell_context.h"
+#include "content/public/browser/browser_context.h"
#include "content/public/browser/mojo_app_connection.h"
+#include "content/public/browser/web_contents.h"
#include "content/public/test/content_browser_test.h"
#include "content/public/test/test_mojo_app.h"
#include "content/public/test/test_mojo_service.mojom.h"
+#include "content/shell/browser/shell.h"
#include "url/gurl.h"
namespace content {
@@ -24,6 +27,12 @@ class MojoShellTest : public ContentBrowserTest {
MojoShellContext::SetApplicationsForTest(&test_apps_);
}
+ protected:
+ std::string GetUserId() {
+ return BrowserContext::GetMojoUserIdFor(
+ shell()->web_contents()->GetBrowserContext());
+ }
+
private:
static scoped_ptr<mojo::ShellClient> CreateTestApp() {
return scoped_ptr<mojo::ShellClient>(new TestMojoApp);
@@ -35,7 +44,8 @@ class MojoShellTest : public ContentBrowserTest {
};
IN_PROC_BROWSER_TEST_F(MojoShellTest, TestBrowserConnection) {
- auto test_app = MojoAppConnection::Create(kInProcessTestMojoAppName,
+ auto test_app = MojoAppConnection::Create(GetUserId(),
+ kInProcessTestMojoAppName,
kBrowserMojoAppUrl);
TestMojoServicePtr test_service;
test_app->GetInterface(&test_service);
@@ -49,7 +59,8 @@ IN_PROC_BROWSER_TEST_F(MojoShellTest, TestUtilityConnection) {
// With no loader registered at this URL, the shell should spawn a utility
// process and connect us to it. content_shell's utility process always hosts
// a TestMojoApp at |kTestMojoAppUrl|.
- auto test_app = MojoAppConnection::Create(kTestMojoAppUrl,
+ auto test_app = MojoAppConnection::Create(GetUserId(),
+ kTestMojoAppUrl,
kBrowserMojoAppUrl);
TestMojoServicePtr test_service;
test_app->GetInterface(&test_service);

Powered by Google App Engine
This is Rietveld 408576698