summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/bind_unittest.cc4
-rw-r--r--base/message_loop/message_loop_unittest.cc25
-rw-r--r--base/prefs/pref_notifier_impl_unittest.cc7
-rw-r--r--base/synchronization/condition_variable_unittest.cc5
-rw-r--r--device/bluetooth/bluetooth_utils.cc3
-rw-r--r--device/bluetooth/bluetooth_utils.h2
-rw-r--r--google_apis/gaia/google_service_auth_error.cc17
-rw-r--r--google_apis/gaia/google_service_auth_error.h7
-rw-r--r--net/cert/x509_certificate_mac.cc27
-rw-r--r--net/socket/ssl_client_socket_nss.cc1
-rw-r--r--tools/gn/builder_unittest.cc14
-rw-r--r--tools/gn/command_desc.cc5
-rw-r--r--tools/gn/trace.cc4
-rw-r--r--tools/imagediff/image_diff_png.cc7
-rw-r--r--ui/accessibility/ax_tree_unittest.cc8
-rw-r--r--ui/gfx/color_analysis_unittest.cc9
16 files changed, 2 insertions, 143 deletions
diff --git a/base/bind_unittest.cc b/base/bind_unittest.cc
index 2c93d53..e1f15cb 100644
--- a/base/bind_unittest.cc
+++ b/base/bind_unittest.cc
@@ -127,10 +127,6 @@ class CopyCounter {
return *copies_;
}
- int assigns() const {
- return *assigns_;
- }
-
private:
int* copies_;
int* assigns_;
diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc
index 4637165..7ccee73 100644
--- a/base/message_loop/message_loop_unittest.cc
+++ b/base/message_loop/message_loop_unittest.cc
@@ -53,36 +53,11 @@ class Foo : public RefCounted<Foo> {
Foo() : test_count_(0) {
}
- void Test0() {
- ++test_count_;
- }
-
void Test1ConstRef(const std::string& a) {
++test_count_;
result_.append(a);
}
- void Test1Ptr(std::string* a) {
- ++test_count_;
- result_.append(*a);
- }
-
- void Test1Int(int a) {
- test_count_ += a;
- }
-
- void Test2Ptr(std::string* a, std::string* b) {
- ++test_count_;
- result_.append(*a);
- result_.append(*b);
- }
-
- void Test2Mixed(const std::string& a, std::string* b) {
- ++test_count_;
- result_.append(a);
- result_.append(*b);
- }
-
int test_count() const { return test_count_; }
const std::string& result() const { return result_; }
diff --git a/base/prefs/pref_notifier_impl_unittest.cc b/base/prefs/pref_notifier_impl_unittest.cc
index 29ea322..8482c02 100644
--- a/base/prefs/pref_notifier_impl_unittest.cc
+++ b/base/prefs/pref_notifier_impl_unittest.cc
@@ -80,13 +80,6 @@ class PrefObserverMock : public PrefObserver {
virtual ~PrefObserverMock() {}
MOCK_METHOD2(OnPreferenceChanged, void(PrefService*, const std::string&));
-
- void Expect(PrefService* prefs,
- const std::string& pref_name,
- const base::Value* value) {
- EXPECT_CALL(*this, OnPreferenceChanged(prefs, pref_name))
- .With(PrefValueMatches(prefs, pref_name, value));
- }
};
// Test fixture class.
diff --git a/base/synchronization/condition_variable_unittest.cc b/base/synchronization/condition_variable_unittest.cc
index ee554ff..5f947a9 100644
--- a/base/synchronization/condition_variable_unittest.cc
+++ b/base/synchronization/condition_variable_unittest.cc
@@ -101,7 +101,6 @@ class WorkQueue : public PlatformThread::Delegate {
int GetNumThreadsTakingAssignments() const;
int GetNumThreadsCompletingTasks() const;
int GetNumberOfCompletedTasks() const;
- TimeDelta GetWorkTime() const;
void SetWorkTime(TimeDelta delay);
void SetTaskCount(int count);
@@ -651,10 +650,6 @@ int WorkQueue::GetNumberOfCompletedTasks() const {
return total;
}
-TimeDelta WorkQueue::GetWorkTime() const {
- return worker_delay_;
-}
-
void WorkQueue::SetWorkTime(TimeDelta delay) {
worker_delay_ = delay;
}
diff --git a/device/bluetooth/bluetooth_utils.cc b/device/bluetooth/bluetooth_utils.cc
index df0c875..b874736 100644
--- a/device/bluetooth/bluetooth_utils.cc
+++ b/device/bluetooth/bluetooth_utils.cc
@@ -79,9 +79,6 @@ UUID::UUID(const std::string& uuid) {
GetCanonicalUuid(uuid, &value_, &canonical_value_, &format_);
}
-UUID::UUID() : format_(kFormatInvalid) {
-}
-
UUID::~UUID() {
}
diff --git a/device/bluetooth/bluetooth_utils.h b/device/bluetooth/bluetooth_utils.h
index 29455da..1f9a2c9 100644
--- a/device/bluetooth/bluetooth_utils.h
+++ b/device/bluetooth/bluetooth_utils.h
@@ -74,8 +74,6 @@ class UUID {
bool operator!=(const UUID& uuid) const;
private:
- UUID();
-
// String representation of the UUID that was used during construction. For
// the supported sizes, this representation can have the following formats:
// - 16 bit: XXXX
diff --git a/google_apis/gaia/google_service_auth_error.cc b/google_apis/gaia/google_service_auth_error.cc
index 736bbd6..d968136 100644
--- a/google_apis/gaia/google_service_auth_error.cc
+++ b/google_apis/gaia/google_service_auth_error.cc
@@ -81,12 +81,6 @@ GoogleServiceAuthError::GoogleServiceAuthError(
error_message_(error_message) {
}
-GoogleServiceAuthError::GoogleServiceAuthError(const std::string& error_message)
- : state_(INVALID_GAIA_CREDENTIALS),
- network_error_(0),
- error_message_(error_message) {
-}
-
// static
GoogleServiceAuthError
GoogleServiceAuthError::FromConnectionError(int error) {
@@ -259,14 +253,3 @@ GoogleServiceAuthError::GoogleServiceAuthError(
captcha_unlock_url, image_width, image_height),
network_error_(0) {
}
-
-GoogleServiceAuthError::GoogleServiceAuthError(
- State s,
- const std::string& captcha_token,
- const std::string& prompt_text,
- const std::string& alternate_text,
- int field_length)
- : state_(s),
- second_factor_(captcha_token, prompt_text, alternate_text, field_length),
- network_error_(0) {
-}
diff --git a/google_apis/gaia/google_service_auth_error.h b/google_apis/gaia/google_service_auth_error.h
index 19fdb51..3d441ef 100644
--- a/google_apis/gaia/google_service_auth_error.h
+++ b/google_apis/gaia/google_service_auth_error.h
@@ -189,8 +189,6 @@ class GoogleServiceAuthError {
// Construct a GoogleServiceAuthError from |state| and |error_message|.
GoogleServiceAuthError(State state, const std::string& error_message);
- explicit GoogleServiceAuthError(const std::string& error_message);
-
GoogleServiceAuthError(State s, const std::string& captcha_token,
const GURL& captcha_audio_url,
const GURL& captcha_image_url,
@@ -198,11 +196,6 @@ class GoogleServiceAuthError {
int image_width,
int image_height);
- GoogleServiceAuthError(State s, const std::string& captcha_token,
- const std::string& prompt_text,
- const std::string& alternate_text,
- int field_length);
-
State state_;
Captcha captcha_;
SecondFactor second_factor_;
diff --git a/net/cert/x509_certificate_mac.cc b/net/cert/x509_certificate_mac.cc
index a7f8624..ab47938 100644
--- a/net/cert/x509_certificate_mac.cc
+++ b/net/cert/x509_certificate_mac.cc
@@ -196,33 +196,6 @@ void AddCertificatesFromBytes(const char* data, size_t length,
}
}
-struct CSSMOIDString {
- const CSSM_OID* oid_;
- std::string string_;
-};
-
-typedef std::vector<CSSMOIDString> CSSMOIDStringVector;
-
-class ScopedEncodedCertResults {
- public:
- explicit ScopedEncodedCertResults(CSSM_TP_RESULT_SET* results)
- : results_(results) { }
- ~ScopedEncodedCertResults() {
- if (results_) {
- CSSM_ENCODED_CERT* encCert =
- reinterpret_cast<CSSM_ENCODED_CERT*>(results_->Results);
- for (uint32 i = 0; i < results_->NumberOfResults; i++) {
- crypto::CSSMFree(encCert[i].CertBlob.Data);
- }
- crypto::CSSMFree(results_->Results);
- crypto::CSSMFree(results_);
- }
- }
-
- private:
- CSSM_TP_RESULT_SET* results_;
-};
-
} // namespace
void X509Certificate::Initialize() {
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 5e56d51..b3c8e0e 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -330,7 +330,6 @@ class PeerCertificateChain {
std::vector<base::StringPiece> AsStringPieceVector() const;
bool empty() const { return certs_.empty(); }
- size_t size() const { return certs_.size(); }
CERTCertificate* operator[](size_t index) const {
DCHECK_LT(index, certs_.size());
diff --git a/tools/gn/builder_unittest.cc b/tools/gn/builder_unittest.cc
index e605b9e..34824ba 100644
--- a/tools/gn/builder_unittest.cc
+++ b/tools/gn/builder_unittest.cc
@@ -35,20 +35,8 @@ class MockLoader : public Loader {
return files_.empty();
}
- // Returns true if one load has been requested and it matches the given
+ // Returns true if two loads have been requested and they match the given
// file. This will clear the records so it will be empty for the next call.
- bool HasLoadedOne(const SourceFile& f) {
- if (files_.size() != 1u) {
- files_.clear();
- return false;
- }
-
- bool match = (files_[0] == f);
- files_.clear();
- return match;
- }
-
- // Like HasLoadedOne above. Accepts any ordering.
bool HasLoadedTwo(const SourceFile& a, const SourceFile& b) {
if (files_.size() != 2u) {
files_.clear();
diff --git a/tools/gn/command_desc.cc b/tools/gn/command_desc.cc
index 4917dcf..a4a7fd0 100644
--- a/tools/gn/command_desc.cc
+++ b/tools/gn/command_desc.cc
@@ -186,11 +186,6 @@ template<> struct DescValueWriter<std::string> {
out << " " << str << "\n";
}
};
-template<> struct DescValueWriter<SourceFile> {
- void operator()(const SourceFile& file, std::ostream& out) const {
- out << " " << file.value() << "\n";
- }
-};
template<> struct DescValueWriter<SourceDir> {
void operator()(const SourceDir& dir, std::ostream& out) const {
out << " " << FormatSourceDir(dir) << "\n";
diff --git a/tools/gn/trace.cc b/tools/gn/trace.cc
index 26fb276..a2f34a3 100644
--- a/tools/gn/trace.cc
+++ b/tools/gn/trace.cc
@@ -24,9 +24,7 @@ class TraceLog {
TraceLog() {
events_.reserve(16384);
}
- ~TraceLog() {
- // Trace items leanked intentionally.
- }
+ // Trace items leaked intentionally.
void Add(TraceItem* item) {
base::AutoLock lock(lock_);
diff --git a/tools/imagediff/image_diff_png.cc b/tools/imagediff/image_diff_png.cc
index a34a799..7524026 100644
--- a/tools/imagediff/image_diff_png.cc
+++ b/tools/imagediff/image_diff_png.cc
@@ -37,13 +37,6 @@ enum ColorFormat {
// Represents a comment in the tEXt ancillary chunk of the png.
struct Comment {
- Comment(const std::string& k, const std::string& t)
- : key(k), text(t) {
- }
-
- ~Comment() {
- };
-
std::string key;
std::string text;
};
diff --git a/ui/accessibility/ax_tree_unittest.cc b/ui/accessibility/ax_tree_unittest.cc
index 7dcf59e..f4c609e 100644
--- a/ui/accessibility/ax_tree_unittest.cc
+++ b/ui/accessibility/ax_tree_unittest.cc
@@ -32,16 +32,8 @@ class FakeAXTreeDelegate : public AXTreeDelegate {
new_root_ids_.push_back(new_root->id());
}
- void Reset() {
- deleted_ids_.clear();
- created_ids_.clear();
- changed_ids_.clear();
- new_root_ids_.clear();
- }
-
const std::vector<int32>& deleted_ids() { return deleted_ids_; }
const std::vector<int32>& created_ids() { return created_ids_; }
- const std::vector<int32>& changed_ids() { return changed_ids_; }
const std::vector<int32>& new_root_ids() { return new_root_ids_; }
private:
diff --git a/ui/gfx/color_analysis_unittest.cc b/ui/gfx/color_analysis_unittest.cc
index 7757eb9..b8234d6 100644
--- a/ui/gfx/color_analysis_unittest.cc
+++ b/ui/gfx/color_analysis_unittest.cc
@@ -104,15 +104,6 @@ class MockKMeanImageSampler : public color_utils::KMeanImageSampler {
prebaked_sample_results_.push_back(sample);
}
- void Reset() {
- prebaked_sample_results_.clear();
- ResetCounter();
- }
-
- void ResetCounter() {
- current_result_index_ = 0;
- }
-
virtual int GetSample(int width, int height) OVERRIDE {
if (current_result_index_ >= prebaked_sample_results_.size()) {
current_result_index_ = 0;
generated by cgit v1.1 at 2025-01-11 01:05:18 +0000