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

Side by Side Diff: chrome/browser/extensions/api/system_private/system_private_apitest.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 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
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 "base/macros.h" 5 #include "base/macros.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 17 matching lines...) Expand all
28 #if defined(OS_CHROMEOS) 28 #if defined(OS_CHROMEOS)
29 29
30 class GetUpdateStatusApiTest : public ExtensionApiTest { 30 class GetUpdateStatusApiTest : public ExtensionApiTest {
31 public: 31 public:
32 GetUpdateStatusApiTest() : fake_update_engine_client_(NULL) {} 32 GetUpdateStatusApiTest() : fake_update_engine_client_(NULL) {}
33 33
34 void SetUpInProcessBrowserTestFixture() override { 34 void SetUpInProcessBrowserTestFixture() override {
35 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); 35 ExtensionApiTest::SetUpInProcessBrowserTestFixture();
36 fake_update_engine_client_ = new chromeos::FakeUpdateEngineClient; 36 fake_update_engine_client_ = new chromeos::FakeUpdateEngineClient;
37 chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient( 37 chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient(
38 scoped_ptr<UpdateEngineClient>(fake_update_engine_client_)); 38 std::unique_ptr<UpdateEngineClient>(fake_update_engine_client_));
39 } 39 }
40 40
41 void TearDownInProcessBrowserTestFixture() override { 41 void TearDownInProcessBrowserTestFixture() override {
42 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); 42 ExtensionApiTest::TearDownInProcessBrowserTestFixture();
43 } 43 }
44 44
45 protected: 45 protected:
46 chromeos::FakeUpdateEngineClient* fake_update_engine_client_; 46 chromeos::FakeUpdateEngineClient* fake_update_engine_client_;
47 47
48 private: 48 private:
(...skipping 13 matching lines...) Expand all
62 // The fake client returns the last status in this order. 62 // The fake client returns the last status in this order.
63 fake_update_engine_client_->PushLastStatus(status_not_available); 63 fake_update_engine_client_->PushLastStatus(status_not_available);
64 fake_update_engine_client_->PushLastStatus(status_updating); 64 fake_update_engine_client_->PushLastStatus(status_updating);
65 fake_update_engine_client_->PushLastStatus(status_boot_needed); 65 fake_update_engine_client_->PushLastStatus(status_boot_needed);
66 66
67 ASSERT_TRUE(RunComponentExtensionTest( 67 ASSERT_TRUE(RunComponentExtensionTest(
68 "system/get_update_status")) << message_; 68 "system/get_update_status")) << message_;
69 } 69 }
70 70
71 #endif 71 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698