chrome/browser/chromeos/settings/mock_owner_key_utils.h - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

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

Unified Diff: chrome/browser/chromeos/settings/mock_owner_key_utils.h

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 5 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 | « chrome/browser/chromeos/settings/device_settings_provider_unittest.cc ('k') | chrome/browser/chromeos/settings/mock_owner_key_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/mock_owner_key_utils.h

diff --git a/chrome/browser/chromeos/login/mock_owner_key_utils.h b/chrome/browser/chromeos/settings/mock_owner_key_utils.h

similarity index 84%

rename from chrome/browser/chromeos/login/mock_owner_key_utils.h

rename to chrome/browser/chromeos/settings/mock_owner_key_utils.h

index 5bd0c452476df9ddfb97e44e74c2d2adfab144da..1a551791d1a4f392684ec8586b81bc3c027cbf27 100644

--- a/chrome/browser/chromeos/login/mock_owner_key_utils.h

+++ b/chrome/browser/chromeos/settings/mock_owner_key_utils.h

@@ -1,17 +1,17 @@

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

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_OWNER_KEY_UTILS_H_

-#define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_OWNER_KEY_UTILS_H_

+#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_MOCK_OWNER_KEY_UTILS_H_

+#define CHROME_BROWSER_CHROMEOS_SETTINGS_MOCK_OWNER_KEY_UTILS_H_

#include <vector>

#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "base/file_path.h"

+#include "chrome/browser/chromeos/settings/owner_key_utils.h"

#include "crypto/rsa_private_key.h"

-#include "chrome/browser/chromeos/login/owner_key_utils.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -58,4 +58,4 @@ class MockInjector : public OwnerKeyUtils::Factory {

} // namespace chromeos

-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_OWNER_KEY_UTILS_H_

+#endif // CHROME_BROWSER_CHROMEOS_SETTINGS_MOCK_OWNER_KEY_UTILS_H_