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

Side by Side Diff: chrome/browser/extensions/system/system_apitest.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 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:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/extensions/system/system_api.cc ('k') | chrome/browser/idle_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/prefs/pref_service.h" 6 #include "chrome/browser/prefs/pref_service.h"
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 10
11 #if defined(OS_CHROMEOS) 11 #if defined(OS_CHROMEOS)
12 #include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h" 12 #include "chromeos/dbus/mock_dbus_thread_manager.h"
13 #include "chrome/browser/chromeos/dbus/mock_update_engine_client.h" 13 #include "chromeos/dbus/mock_update_engine_client.h"
14 14
15 using chromeos::UpdateEngineClient; 15 using chromeos::UpdateEngineClient;
16 using ::testing::Return; 16 using ::testing::Return;
17 #endif 17 #endif
18 18
19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetIncognitoModeAvailability) { 19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetIncognitoModeAvailability) {
20 PrefService* pref_service = browser()->profile()->GetPrefs(); 20 PrefService* pref_service = browser()->profile()->GetPrefs();
21 pref_service->SetInteger(prefs::kIncognitoModeAvailability, 1); 21 pref_service->SetInteger(prefs::kIncognitoModeAvailability, 1);
22 22
23 EXPECT_TRUE(RunComponentExtensionTest( 23 EXPECT_TRUE(RunComponentExtensionTest(
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 EXPECT_CALL(*mock_update_engine_client_, GetLastStatus()) 64 EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())
65 .WillOnce(Return(status_not_available)) 65 .WillOnce(Return(status_not_available))
66 .WillOnce(Return(status_updating)) 66 .WillOnce(Return(status_updating))
67 .WillOnce(Return(status_boot_needed)); 67 .WillOnce(Return(status_boot_needed));
68 ASSERT_TRUE(RunComponentExtensionTest( 68 ASSERT_TRUE(RunComponentExtensionTest(
69 "system/get_update_status")) << message_; 69 "system/get_update_status")) << message_;
70 } 70 }
71 71
72 #endif 72 #endif
OLDNEW
« no previous file with comments | « chrome/browser/extensions/system/system_api.cc ('k') | chrome/browser/idle_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698