chrome/browser/chromeos/login/signed_settings_unittest.cc - Issue 9703098: Remove "base/values.h" import from "base/location.h", fix up downstream files.

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/login/signed_settings_unittest.cc

Issue 9703098: Remove "base/values.h" import from "base/location.h", fix up downstream files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix one more file on ChromiumOS Created 8 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chrome_to_mobile_service.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/chromeos/login/signed_settings.h"	5 #include "chrome/browser/chromeos/login/signed_settings.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/message_loop.h"	8 #include "base/message_loop.h"

	9 #include "base/values.h"

9 #include "chrome/browser/chromeos/cros/cros_library.h"	10 #include "chrome/browser/chromeos/cros/cros_library.h"

10 #include "chrome/browser/chromeos/cros/mock_library_loader.h"	11 #include "chrome/browser/chromeos/cros/mock_library_loader.h"

11 #include "chrome/browser/chromeos/cros_settings_names.h"	12 #include "chrome/browser/chromeos/cros_settings_names.h"

12 #include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"	13 #include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"

13 #include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"	14 #include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"

14 #include "chrome/browser/chromeos/login/mock_owner_key_utils.h"	15 #include "chrome/browser/chromeos/login/mock_owner_key_utils.h"

15 #include "chrome/browser/chromeos/login/mock_ownership_service.h"	16 #include "chrome/browser/chromeos/login/mock_ownership_service.h"

16 #include "chrome/browser/chromeos/login/owner_manager_unittest.h"	17 #include "chrome/browser/chromeos/login/owner_manager_unittest.h"

17 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"	18 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"

18 #include "chrome/browser/policy/proto/device_management_backend.pb.h"	19 #include "chrome/browser/policy/proto/device_management_backend.pb.h"

(...skipping 370 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
389 .Times(1);	390 .Times(1);

390	391

391 s->Execute();	392 s->Execute();

392 message_loop_.RunAllPending();	393 message_loop_.RunAllPending();

393	394

394 s->OnKeyOpComplete(OwnerManager::OPERATION_FAILED, std::vector<uint8>());	395 s->OnKeyOpComplete(OwnerManager::OPERATION_FAILED, std::vector<uint8>());

395 message_loop_.RunAllPending();	396 message_loop_.RunAllPending();

396 }	397 }

397	398

398 } // namespace chromeos	399 } // namespace chromeos

OLD	NEW