OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/browser/api/test/test_api.h" | 5 #include "extensions/browser/api/test/test_api.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 } | 99 } |
100 | 100 |
101 // static | 101 // static |
102 void TestGetConfigFunction::set_test_config_state( | 102 void TestGetConfigFunction::set_test_config_state( |
103 base::DictionaryValue* value) { | 103 base::DictionaryValue* value) { |
104 TestConfigState* test_config_state = TestConfigState::GetInstance(); | 104 TestConfigState* test_config_state = TestConfigState::GetInstance(); |
105 test_config_state->set_config_state(value); | 105 test_config_state->set_config_state(value); |
106 } | 106 } |
107 | 107 |
108 TestGetConfigFunction::TestConfigState::TestConfigState() | 108 TestGetConfigFunction::TestConfigState::TestConfigState() |
109 : config_state_(NULL) {} | 109 : config_state_(nullptr) { |
| 110 } |
110 | 111 |
111 // static | 112 // static |
112 TestGetConfigFunction::TestConfigState* | 113 TestGetConfigFunction::TestConfigState* |
113 TestGetConfigFunction::TestConfigState::GetInstance() { | 114 TestGetConfigFunction::TestConfigState::GetInstance() { |
114 return Singleton<TestConfigState>::get(); | 115 return Singleton<TestConfigState>::get(); |
115 } | 116 } |
116 | 117 |
117 TestGetConfigFunction::~TestGetConfigFunction() {} | 118 TestGetConfigFunction::~TestGetConfigFunction() {} |
118 | 119 |
119 bool TestGetConfigFunction::RunSafe() { | 120 bool TestGetConfigFunction::RunSafe() { |
(...skipping 11 matching lines...) Expand all Loading... |
131 TestWaitForRoundTripFunction::~TestWaitForRoundTripFunction() {} | 132 TestWaitForRoundTripFunction::~TestWaitForRoundTripFunction() {} |
132 | 133 |
133 bool TestWaitForRoundTripFunction::RunSafe() { | 134 bool TestWaitForRoundTripFunction::RunSafe() { |
134 scoped_ptr<WaitForRoundTrip::Params> params( | 135 scoped_ptr<WaitForRoundTrip::Params> params( |
135 WaitForRoundTrip::Params::Create(*args_)); | 136 WaitForRoundTrip::Params::Create(*args_)); |
136 SetResult(new base::StringValue(params->message)); | 137 SetResult(new base::StringValue(params->message)); |
137 return true; | 138 return true; |
138 } | 139 } |
139 | 140 |
140 } // namespace extensions | 141 } // namespace extensions |
OLD | NEW |