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

Unified Diff: blimp/engine/browser_tests/navigation_browsertest.cc

Issue 2349073002: Blimp Settings framework on the c++ side (Closed)
Patch Set: nits and sync to head Created 4 years, 2 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 | « blimp/engine/browser_tests/integration_test.cc ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/engine/browser_tests/navigation_browsertest.cc
diff --git a/blimp/engine/browser_tests/navigation_browsertest.cc b/blimp/engine/browser_tests/navigation_browsertest.cc
index 25ee0ac39832f793270ea27c2c6f44c13a962c9a..926193be7173ce86374e8cf19c6263017d49cdb0 100644
--- a/blimp/engine/browser_tests/navigation_browsertest.cc
+++ b/blimp/engine/browser_tests/navigation_browsertest.cc
@@ -11,6 +11,7 @@
#include "blimp/client/test/contents/mock_blimp_contents_observer.h"
#include "blimp/client/test/test_blimp_client_context_delegate.h"
#include "blimp/engine/browser_tests/blimp_browser_test.h"
+#include "components/prefs/testing_pref_service.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/browser_test.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -41,13 +42,15 @@ class NavigationBrowserTest : public BlimpBrowserTest {
void SetUpOnMainThread() override {
BlimpBrowserTest::SetUpOnMainThread();
+ client::BlimpClientContext::RegisterPrefs(prefs_.registry());
+
context_ = base::WrapUnique<client::BlimpClientContext>(
client::BlimpClientContext::Create(
content::BrowserThread::GetTaskRunnerForThread(
content::BrowserThread::IO),
content::BrowserThread::GetTaskRunnerForThread(
content::BrowserThread::FILE),
- base::MakeUnique<client::MockCompositorDependencies>()));
+ base::MakeUnique<client::MockCompositorDependencies>(), &prefs_));
delegate_ = base::MakeUnique<client::TestBlimpClientContextDelegate>();
context_->SetDelegate(delegate_.get());
@@ -107,6 +110,7 @@ class NavigationBrowserTest : public BlimpBrowserTest {
std::unique_ptr<client::BlimpContents> contents_;
private:
+ TestingPrefServiceSimple prefs_;
DISALLOW_COPY_AND_ASSIGN(NavigationBrowserTest);
};
« no previous file with comments | « blimp/engine/browser_tests/integration_test.cc ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698