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

Side by Side Diff: chrome/browser/policy/device_status_collector_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/policy/device_status_collector.h" 5 #include "chrome/browser/policy/device_status_collector.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/chromeos/cros_settings.h" 10 #include "chrome/browser/chromeos/cros_settings.h"
11 #include "chrome/browser/chromeos/cros_settings_names.h" 11 #include "chrome/browser/chromeos/cros_settings_names.h"
12 #include "chrome/browser/chromeos/cros_settings_provider.h" 12 #include "chrome/browser/chromeos/cros_settings_provider.h"
13 #include "chrome/browser/chromeos/stub_cros_settings_provider.h" 13 #include "chrome/browser/chromeos/stub_cros_settings_provider.h"
14 #include "chrome/browser/chromeos/system/mock_statistics_provider.h" 14 #include "chrome/browser/chromeos/system/mock_statistics_provider.h"
15 #include "chrome/browser/chromeos/system/statistics_provider.h" 15 #include "chrome/browser/chromeos/system/statistics_provider.h"
16 #include "chrome/browser/policy/proto/device_management_backend.pb.h" 16 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
17 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "chrome/test/base/testing_pref_service.h" 19 #include "chrome/test/base/testing_pref_service.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/test/test_browser_thread.h" 21 #include "content/public/test/test_browser_thread.h"
22 #include "testing/gmock/include/gmock/gmock.h" 22 #include "testing/gmock/include/gmock/gmock.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 24
25 using ::testing::_; 25 using ::testing::_;
26 using ::testing::DoAll; 26 using ::testing::DoAll;
27 using ::testing::NotNull; 27 using ::testing::NotNull;
28 using ::testing::Return; 28 using ::testing::Return;
29 using ::testing::SetArgPointee; 29 using ::testing::SetArgPointee;
30 using base::TimeDelta; 30 using base::TimeDelta;
31 using base::Time; 31 using base::Time;
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 // Check that after enabling location reporting again, an error is reported 526 // Check that after enabling location reporting again, an error is reported
527 // if no valid fix is available. 527 // if no valid fix is available.
528 SetMockPositionToReturnNext(invalid_fix); 528 SetMockPositionToReturnNext(invalid_fix);
529 cros_settings_->SetBoolean(chromeos::kReportDeviceLocation, true); 529 cros_settings_->SetBoolean(chromeos::kReportDeviceLocation, true);
530 // Allow the new pref to propagate to the status collector. 530 // Allow the new pref to propagate to the status collector.
531 message_loop_.RunAllPending(); 531 message_loop_.RunAllPending();
532 CheckThatALocationErrorIsReported(); 532 CheckThatALocationErrorIsReported();
533 } 533 }
534 534
535 } // namespace policy 535 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/device_policy_cache_unittest.cc ('k') | chrome/browser/policy/device_token_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698