| 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 <list> | 5 #include <list> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 ASSERT_TRUE(dict->GetInteger("status", &status)); | 157 ASSERT_TRUE(dict->GetInteger("status", &status)); |
| 158 std::string value_str; | 158 std::string value_str; |
| 159 ASSERT_TRUE(dict->GetString("value", &value_str)); | 159 ASSERT_TRUE(dict->GetString("value", &value_str)); |
| 160 EXPECT_STREQ("stuff", value_str.c_str()); | 160 EXPECT_STREQ("stuff", value_str.c_str()); |
| 161 EXPECT_EQ(kOk, status); | 161 EXPECT_EQ(kOk, status); |
| 162 } | 162 } |
| 163 { | 163 { |
| 164 base::DictionaryValue params; | 164 base::DictionaryValue params; |
| 165 scoped_ptr<base::Value> value(base::Value::CreateNullValue()); | 165 scoped_ptr<base::Value> value(base::Value::CreateNullValue()); |
| 166 mock->Expect(scoped_ptr<ExpectedCommand>(new ExpectedCommand( | 166 mock->Expect(scoped_ptr<ExpectedCommand>(new ExpectedCommand( |
| 167 "quitAll", params, "", kOk, value.Pass(), ""))); | 167 "quitAll", params, std::string(), kOk, value.Pass(), std::string()))); |
| 168 } | 168 } |
| 169 Shutdown(); | 169 Shutdown(); |
| 170 } | 170 } |
| OLD | NEW |