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

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

Issue 2349073002: Blimp Settings framework on the c++ side (Closed)
Patch Set: Created 4 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: blimp/engine/browser_tests/integration_test.cc
diff --git a/blimp/engine/browser_tests/integration_test.cc b/blimp/engine/browser_tests/integration_test.cc
index e1311382faeb982749c51bc78102c278c99a0e7c..224db4e4dcd75c813a2fb57e6931dc19a7c55260 100644
--- a/blimp/engine/browser_tests/integration_test.cc
+++ b/blimp/engine/browser_tests/integration_test.cc
@@ -20,6 +20,7 @@
#include "blimp/engine/browser_tests/blimp_browser_test.h"
#include "blimp/engine/browser_tests/blimp_contents_view_readback_helper.h"
#include "blimp/engine/browser_tests/waitable_content_pump.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"
@@ -82,13 +83,16 @@ class BlimpIntegrationTest : public BlimpBrowserTest {
delegate_ = base::MakeUnique<client::TestBlimpClientContextDelegate>();
+ TestingPrefServiceSimple prefs;
David Trainor- moved to gerrit 2016/09/27 04:10:07 Won't this die right after this call? Move this t
Menglin 2016/09/30 23:48:57 Right. thank you
+ 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),
- std::move(compositor_dependencies)));
+ std::move(compositor_dependencies), &prefs));
context_->SetDelegate(delegate_.get());
context_->ConnectWithAssignment(GetAssignment());

Powered by Google App Engine
This is Rietveld 408576698