summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/memory/singleton_unittest.cc3
-rw-r--r--chrome/browser/browser_about_handler.cc6
-rw-r--r--chrome/browser/prefs/pref_notifier_impl_unittest.cc7
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_database_unittest.cc20
-rw-r--r--chrome/browser/sync/engine/syncapi_unittest.cc14
-rw-r--r--chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm1
-rw-r--r--chrome/browser/webdata/web_database_migration_unittest.cc26
-rw-r--r--ppapi/proxy/ppapi_proxy_test.cc7
-rw-r--r--ppapi/tests/test_post_message.cc7
-rw-r--r--webkit/quota/quota_database.cc15
10 files changed, 1 insertions, 105 deletions
diff --git a/base/memory/singleton_unittest.cc b/base/memory/singleton_unittest.cc
index a605885..ba10c75 100644
--- a/base/memory/singleton_unittest.cc
+++ b/base/memory/singleton_unittest.cc
@@ -136,9 +136,6 @@ CallbackFunc* GetStaticSingleton() {
return &CallbackSingletonWithStaticTrait::GetInstance()->callback_;
}
-void ResurrectStaticSingleton() {
-}
-
} // namespace
class SingletonTest : public testing::Test {
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 12f008c..10831aa 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -984,12 +984,6 @@ std::string AboutVersion(DictionaryValue* localized_strings) {
version_html, localized_strings, "t" /* template root node id */);
}
-std::string VersionNumberToString(uint32 value) {
- int hi = (value >> 8) & 0xff;
- int low = value & 0xff;
- return base::IntToString(hi) + "." + base::IntToString(low);
-}
-
// AboutSource -----------------------------------------------------------------
AboutSource::AboutSource()
diff --git a/chrome/browser/prefs/pref_notifier_impl_unittest.cc b/chrome/browser/prefs/pref_notifier_impl_unittest.cc
index c601c33..aaea66f 100644
--- a/chrome/browser/prefs/pref_notifier_impl_unittest.cc
+++ b/chrome/browser/prefs/pref_notifier_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -24,11 +24,6 @@ namespace {
const char kChangedPref[] = "changed_pref";
const char kUnchangedPref[] = "unchanged_pref";
-bool DetailsAreChangedPref(const Details<std::string>& details) {
- std::string* string_in = Details<std::string>(details).ptr();
- return strcmp(string_in->c_str(), kChangedPref) == 0;
-}
-
// Test PrefNotifier that allows tracking of observers and notifications.
class MockPrefNotifier : public PrefNotifierImpl {
public:
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index a179667..cea7a19 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -164,26 +164,6 @@ void InsertSubChunkHost2PrefixUrls(SBChunk* chunk,
}
// Same as InsertSubChunkHost2PrefixUrls, but with full hashes.
-void InsertSubChunkHost2FullHashes(SBChunk* chunk,
- int chunk_number,
- int chunk_id_to_sub,
- const std::string& host_name,
- const std::string& url1,
- const std::string& url2) {
- chunk->chunk_number = chunk_number;
- chunk->is_add = false;
- SBChunkHost host;
- host.host = Sha256Prefix(host_name);
- host.entry = SBEntry::Create(SBEntry::SUB_FULL_HASH, 2);
- host.entry->set_chunk_id(chunk->chunk_number);
- host.entry->SetFullHashAt(0, Sha256Hash(url1));
- host.entry->SetChunkIdAtPrefix(0, chunk_id_to_sub);
- host.entry->SetFullHashAt(1, Sha256Hash(url2));
- host.entry->SetChunkIdAtPrefix(1, chunk_id_to_sub);
- chunk->hosts.push_back(host);
-}
-
-// Same as InsertSubChunkHost2PrefixUrls, but with full hashes.
void InsertSubChunkHostFullHash(SBChunk* chunk,
int chunk_number,
int chunk_id_to_sub,
diff --git a/chrome/browser/sync/engine/syncapi_unittest.cc b/chrome/browser/sync/engine/syncapi_unittest.cc
index 54c09bd..6975459 100644
--- a/chrome/browser/sync/engine/syncapi_unittest.cc
+++ b/chrome/browser/sync/engine/syncapi_unittest.cc
@@ -89,20 +89,6 @@ int64 MakeNode(UserShare* share,
return node.GetId();
}
-// Make a folder as a child of the root node. Returns the id of the
-// newly-created node.
-int64 MakeFolder(UserShare* share,
- syncable::ModelType model_type,
- const std::string& client_tag) {
- WriteTransaction trans(share);
- ReadNode root_node(&trans);
- root_node.InitByRootLookup();
- WriteNode node(&trans);
- EXPECT_TRUE(node.InitUniqueByCreation(model_type, root_node, client_tag));
- node.SetIsFolder(true);
- return node.GetId();
-}
-
// Makes a non-folder child of a non-root node. Returns the id of the
// newly-created node.
int64 MakeNodeWithParent(UserShare* share,
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
index 8c669b8..3badef9 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
@@ -363,7 +363,6 @@ TEST_F(HistoryMenuBridgeTest, GotFaviconData) {
// make icons look pretty.
std::vector<unsigned char> raw;
gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &raw);
- scoped_refptr<RefCountedBytes> bytes();
// Set up the HistoryItem.
HistoryMenuBridge::HistoryItem item;
diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc
index c27abb9..f326c28 100644
--- a/chrome/browser/webdata/web_database_migration_unittest.cc
+++ b/chrome/browser/webdata/web_database_migration_unittest.cc
@@ -57,32 +57,6 @@ void AutofillProfile31FromStatement(const sql::Statement& s,
EXPECT_TRUE(guid::IsValidGUID(profile->guid()));
}
-void AutofillProfile32FromStatement(const sql::Statement& s,
- AutofillProfile* profile,
- string16* label,
- int64* date_modified) {
- DCHECK(profile);
- DCHECK(label);
- DCHECK(date_modified);
- profile->set_guid(s.ColumnString(0));
- EXPECT_TRUE(guid::IsValidGUID(profile->guid()));
- *label = s.ColumnString16(1);
- profile->SetInfo(NAME_FIRST, s.ColumnString16(2));
- profile->SetInfo(NAME_MIDDLE, s.ColumnString16(3));
- profile->SetInfo(NAME_LAST,s.ColumnString16(4));
- profile->SetInfo(EMAIL_ADDRESS, s.ColumnString16(5));
- profile->SetInfo(COMPANY_NAME, s.ColumnString16(6));
- profile->SetInfo(ADDRESS_HOME_LINE1, s.ColumnString16(7));
- profile->SetInfo(ADDRESS_HOME_LINE2, s.ColumnString16(8));
- profile->SetInfo(ADDRESS_HOME_CITY, s.ColumnString16(9));
- profile->SetInfo(ADDRESS_HOME_STATE, s.ColumnString16(10));
- profile->SetInfo(ADDRESS_HOME_ZIP, s.ColumnString16(11));
- profile->SetInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(12));
- profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, s.ColumnString16(13));
- profile->SetInfo(PHONE_FAX_WHOLE_NUMBER, s.ColumnString16(14));
- *date_modified = s.ColumnInt64(15);
-}
-
void AutofillProfile33FromStatement(const sql::Statement& s,
AutofillProfile* profile,
int64* date_modified) {
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index fffb20c..1782302 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -22,13 +22,6 @@ const void* MockGetInterface(const char* name) {
return current_test->GetInterface(name);
}
-int32_t MockInitModule(PP_Module, Dispatcher::GetInterfaceFunc) {
- return PP_OK;
-}
-
-void MockShutdownModuleFunc() {
-}
-
} // namespace
// ProxyTestBase ---------------------------------------------------------------
diff --git a/ppapi/tests/test_post_message.cc b/ppapi/tests/test_post_message.cc
index df7d181..644b3cbf 100644
--- a/ppapi/tests/test_post_message.cc
+++ b/ppapi/tests/test_post_message.cc
@@ -15,13 +15,6 @@ REGISTER_TEST_CASE(PostMessage);
namespace {
-const PPB_Testing_Dev* GetTestingInterface() {
- static const PPB_Testing_Dev* g_testing_interface =
- reinterpret_cast<PPB_Testing_Dev const*>(
- pp::Module::Get()->GetBrowserInterface(PPB_TESTING_DEV_INTERFACE));
- return g_testing_interface;
-}
-
const char kTestString[] = "Hello world!";
const bool kTestBool = true;
const int32_t kTestInt = 42;
diff --git a/webkit/quota/quota_database.cc b/webkit/quota/quota_database.cc
index 8bda57c..6d61853 100644
--- a/webkit/quota/quota_database.cc
+++ b/webkit/quota/quota_database.cc
@@ -64,21 +64,6 @@ class HistogramUniquifier {
static const char* name() { return "Sqlite.Quota.Error"; }
};
-sql::ErrorDelegate* GetErrorHandlerForQuotaManagerDb() {
- return new sql::DiagnosticErrorDelegate<HistogramUniquifier>();
-}
-
-bool PrepareUniqueStatement(
- sql::Connection* db, const char* sql, sql::Statement* statement) {
- DCHECK(db && sql && statement);
- statement->Assign(db->GetUniqueStatement(sql));
- if (!statement->is_valid()) {
- NOTREACHED() << db->GetErrorMessage();
- return false;
- }
- return true;
-}
-
bool PrepareCachedStatement(
sql::Connection* db, const sql::StatementID& id,
const char* sql, sql::Statement* statement) {
generated by cgit v1.1 at 2025-01-17 22:25:01 +0000