diff options
author | bcf <bcf@google.com> | 2015-07-29 11:23:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-29 18:24:22 +0000 |
commit | 62f6287af58fa80a2b830e436ea4f8dd20b8e1d5 (patch) | |
tree | 8353d322eaa3a88704b2ac1b7da7b8b795d2e192 /chromecast/crash/linux/synchronized_minidump_manager_unittest.cc | |
parent | 3c100cee848bd29360dad2cba9a7013910dacafb (diff) | |
download | chromium_src-62f6287af58fa80a2b830e436ea4f8dd20b8e1d5.zip chromium_src-62f6287af58fa80a2b830e436ea4f8dd20b8e1d5.tar.gz chromium_src-62f6287af58fa80a2b830e436ea4f8dd20b8e1d5.tar.bz2 |
[Chromecast] Consolidate duplicated crash test functions.
TEST=Modified tests build and pass under gyp and gn.
BUG=
Review URL: https://codereview.chromium.org/1254113004
Cr-Commit-Position: refs/heads/master@{#340924}
Diffstat (limited to 'chromecast/crash/linux/synchronized_minidump_manager_unittest.cc')
-rw-r--r-- | chromecast/crash/linux/synchronized_minidump_manager_unittest.cc | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/chromecast/crash/linux/synchronized_minidump_manager_unittest.cc b/chromecast/crash/linux/synchronized_minidump_manager_unittest.cc index 45b507a..41a84f0 100644 --- a/chromecast/crash/linux/synchronized_minidump_manager_unittest.cc +++ b/chromecast/crash/linux/synchronized_minidump_manager_unittest.cc @@ -22,7 +22,7 @@ #include "base/test/scoped_path_override.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "chromecast/base/serializers.h" +#include "chromecast/crash/linux/crash_testing_utils.h" #include "chromecast/crash/linux/dump_info.h" #include "chromecast/crash/linux/synchronized_minidump_manager.h" #include "testing/gtest/include/gtest/gtest.h" @@ -32,7 +32,6 @@ namespace { const char kLockfileName[] = "lockfile"; const char kMinidumpSubdir[] = "minidumps"; -const char kDumpsKey[] = "dumps"; // A trivial implementation of SynchronizedMinidumpManager, which does no work // to the @@ -73,45 +72,6 @@ class SynchronizedMinidumpManagerSimple : public SynchronizedMinidumpManager { scoped_ptr<DumpInfo> dump_info_; }; -bool FetchDumps(const std::string& lockfile_path, - ScopedVector<DumpInfo>* dumps) { - if (!dumps) { - return false; - } - dumps->clear(); - - base::FilePath path(lockfile_path); - scoped_ptr<base::Value> contents(DeserializeJsonFromFile(path)); - - base::DictionaryValue* dict; - base::ListValue* dump_list; - if (!contents || !contents->GetAsDictionary(&dict) || - !dict->GetList(kDumpsKey, &dump_list) || !dump_list) { - return false; - } - - for (base::Value* elem : *dump_list) { - scoped_ptr<DumpInfo> dump = make_scoped_ptr(new DumpInfo(elem)); - if (!dump->valid()) { - return false; - } - dumps->push_back(dump.Pass()); - } - - return true; -} - -bool CreateLockFile(const std::string& lockfile_path) { - scoped_ptr<base::DictionaryValue> output = - make_scoped_ptr(new base::DictionaryValue()); - output->Set("dumps", make_scoped_ptr(new base::ListValue())); - - base::FilePath path(lockfile_path); - - const base::Value* val = output.get(); - return SerializeJsonToFile(path, *val); -} - void DoWorkLockedTask(SynchronizedMinidumpManagerSimple* manager) { manager->DoWorkLocked(); } |