| OLD | NEW |
| 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 "base/prefs/pref_service.h" | 5 #include "base/prefs/pref_service.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.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 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 GetUpdateStatusApiTest() : fake_update_engine_client_(NULL) {} | 30 GetUpdateStatusApiTest() : fake_update_engine_client_(NULL) {} |
| 31 | 31 |
| 32 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 32 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
| 33 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 33 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
| 34 chromeos::FakeDBusThreadManager* fake_dbus_thread_manager = | 34 chromeos::FakeDBusThreadManager* fake_dbus_thread_manager = |
| 35 new chromeos::FakeDBusThreadManager; | 35 new chromeos::FakeDBusThreadManager; |
| 36 fake_dbus_thread_manager->SetFakeClients(); | 36 fake_dbus_thread_manager->SetFakeClients(); |
| 37 fake_update_engine_client_ = new chromeos::FakeUpdateEngineClient; | 37 fake_update_engine_client_ = new chromeos::FakeUpdateEngineClient; |
| 38 fake_dbus_thread_manager->SetUpdateEngineClient( | 38 fake_dbus_thread_manager->SetUpdateEngineClient( |
| 39 scoped_ptr<UpdateEngineClient>(fake_update_engine_client_)); | 39 scoped_ptr<UpdateEngineClient>(fake_update_engine_client_)); |
| 40 chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); | 40 chromeos::DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager)
; |
| 41 } | 41 } |
| 42 | 42 |
| 43 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { | 43 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { |
| 44 chromeos::DBusThreadManager::Shutdown(); | |
| 45 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); | 44 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); |
| 46 } | 45 } |
| 47 | 46 |
| 48 protected: | 47 protected: |
| 49 chromeos::FakeUpdateEngineClient* fake_update_engine_client_; | 48 chromeos::FakeUpdateEngineClient* fake_update_engine_client_; |
| 50 | 49 |
| 51 private: | 50 private: |
| 52 DISALLOW_COPY_AND_ASSIGN(GetUpdateStatusApiTest); | 51 DISALLOW_COPY_AND_ASSIGN(GetUpdateStatusApiTest); |
| 53 }; | 52 }; |
| 54 | 53 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 65 // The fake client returns the last status in this order. | 64 // The fake client returns the last status in this order. |
| 66 fake_update_engine_client_->PushLastStatus(status_not_available); | 65 fake_update_engine_client_->PushLastStatus(status_not_available); |
| 67 fake_update_engine_client_->PushLastStatus(status_updating); | 66 fake_update_engine_client_->PushLastStatus(status_updating); |
| 68 fake_update_engine_client_->PushLastStatus(status_boot_needed); | 67 fake_update_engine_client_->PushLastStatus(status_boot_needed); |
| 69 | 68 |
| 70 ASSERT_TRUE(RunComponentExtensionTest( | 69 ASSERT_TRUE(RunComponentExtensionTest( |
| 71 "system/get_update_status")) << message_; | 70 "system/get_update_status")) << message_; |
| 72 } | 71 } |
| 73 | 72 |
| 74 #endif | 73 #endif |
| OLD | NEW |