Index: chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc |
diff --git a/chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc b/chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc |
index 955ced76f96e52d48e2511e00f2b37d39c70825d..574d861a4185eab65b7f4d260bfaf2a2f5a90f4b 100644 |
--- a/chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc |
+++ b/chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc |
@@ -2,57 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include <string> |
-#include <vector> |
- |
-#include "base/compiler_specific.h" |
#include "base/values.h" |
#include "chrome/test/chromedriver/chrome/geolocation_override_manager.h" |
#include "chrome/test/chromedriver/chrome/geoposition.h" |
+#include "chrome/test/chromedriver/chrome/recorder_devtools_client.h" |
#include "chrome/test/chromedriver/chrome/status.h" |
-#include "chrome/test/chromedriver/chrome/stub_devtools_client.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace { |
-struct Command { |
- Command() {} |
- Command(const std::string& method, const base::DictionaryValue& params) |
- : method(method) { |
- this->params.MergeDictionary(¶ms); |
- } |
- Command(const Command& command) { |
- *this = command; |
- } |
- Command& operator=(const Command& command) { |
- method = command.method; |
- params.Clear(); |
- params.MergeDictionary(&command.params); |
- return *this; |
- } |
- ~Command() {} |
- |
- std::string method; |
- base::DictionaryValue params; |
-}; |
- |
-class RecorderDevToolsClient : public StubDevToolsClient { |
- public: |
- RecorderDevToolsClient() {} |
- ~RecorderDevToolsClient() override {} |
- |
- // Overridden from StubDevToolsClient: |
- Status SendCommandAndGetResult( |
- const std::string& method, |
- const base::DictionaryValue& params, |
- scoped_ptr<base::DictionaryValue>* result) override { |
- commands_.push_back(Command(method, params)); |
- return Status(kOk); |
- } |
- |
- std::vector<Command> commands_; |
-}; |
- |
void AssertGeolocationCommand(const Command& command, |
const Geoposition& geoposition) { |
ASSERT_EQ("Page.setGeolocationOverride", command.method); |