chrome/browser/chromeos/extensions/wallpaper_apitest.cc - Issue 1886653002: Remove WallpaperManager dependency on Cryptohome.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/extensions/wallpaper_apitest.cc

Issue 1886653002: Remove WallpaperManager dependency on Cryptohome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase (raw_salt_ is now properly set). Created 4 years, 8 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:

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/extensions/extension_apitest.h"	5 #include "chrome/browser/extensions/extension_apitest.h"

	6 #include "chromeos/cryptohome/system_salt_getter.h"

6 #include "net/dns/mock_host_resolver.h"	7 #include "net/dns/mock_host_resolver.h"

7	8

8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Wallpaper) {	9 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Wallpaper) {

	10 chromeos::SystemSaltGetter::Get()->SetRawSaltForTesting(

	11 chromeos::SystemSaltGetter::RawSalt({1, 2, 3, 4, 5, 6, 7, 8}));

9 host_resolver()->AddRule("a.com", "127.0.0.1");	12 host_resolver()->AddRule("a.com", "127.0.0.1");

10 ASSERT_TRUE(StartEmbeddedTestServer());	13 ASSERT_TRUE(StartEmbeddedTestServer());

11 ASSERT_TRUE(RunExtensionTest("wallpaper")) << message_;	14 ASSERT_TRUE(RunExtensionTest("wallpaper")) << message_;

12 }	15 }

OLD	NEW