diff options
30 files changed, 40 insertions, 52 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index da9fbd5..a8e9004 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1844,7 +1844,7 @@ void AutomationProvider::OnChannelError() { // TODO(brettw) change this to accept GURLs when history supports it void AutomationProvider::OnRedirectQueryComplete( HistoryService::Handle request_handle, - const GURL& from_url, + GURL from_url, bool success, history::RedirectList* redirects) { DCHECK(request_handle == redirect_query_); diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 8b171b7..0d9b08c 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -466,7 +466,7 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>, // Callback for history redirect queries. virtual void OnRedirectQueryComplete( HistoryService::Handle request_handle, - const GURL& from_url, + GURL from_url, bool success, history::RedirectList* redirects); diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index e9573ac..9bcc8c3 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -636,7 +636,7 @@ void BookmarkModel::OnFavIconDataAvailable( bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url) { + GURL icon_url) { SkBitmap fav_icon; BookmarkNode* node = load_consumer_.GetClientData( diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 1137159..8da3bcd 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -371,7 +371,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url); + GURL icon_url); // Invoked from the node to load the favicon. Requests the favicon from the // history service. diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc index 8f77134..bb7b9f0 100644 --- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc +++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc @@ -42,7 +42,7 @@ void DOMUIFavIconSource::OnFavIconDataAvailable( bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url) { + GURL icon_url) { HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); int request_id = cancelable_consumer_.GetClientData(hs, request_handle); diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.h b/chrome/browser/dom_ui/dom_ui_favicon_source.h index b33f0e5..42d770c 100644 --- a/chrome/browser/dom_ui/dom_ui_favicon_source.h +++ b/chrome/browser/dom_ui/dom_ui_favicon_source.h @@ -37,7 +37,7 @@ class DOMUIFavIconSource : public ChromeURLDataManager::DataSource { bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& url); + GURL url); private: Profile* profile_; diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc index a984ed1..564c262 100644 --- a/chrome/browser/fav_icon_helper.cc +++ b/chrome/browser/fav_icon_helper.cc @@ -155,7 +155,7 @@ void FavIconHelper::OnFavIconDataForInitialURL( bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url) { + GURL icon_url) { NavigationEntry* entry = GetEntry(); if (!entry) return; @@ -226,7 +226,7 @@ void FavIconHelper::OnFavIconData( bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url) { + GURL icon_url) { NavigationEntry* entry = GetEntry(); if (!entry) return; diff --git a/chrome/browser/fav_icon_helper.h b/chrome/browser/fav_icon_helper.h index 1cb1fa0..adbcaf0 100644 --- a/chrome/browser/fav_icon_helper.h +++ b/chrome/browser/fav_icon_helper.h @@ -120,7 +120,7 @@ class FavIconHelper : public RenderViewHostDelegate::FavIcon { bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url); + GURL icon_url); // If the favicon has expired, asks the renderer to download the favicon. // Otherwise asks history to update the mapping between page url and icon @@ -132,7 +132,7 @@ class FavIconHelper : public RenderViewHostDelegate::FavIcon { bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url); + GURL icon_url); // Schedules a download for the specified entry. This adds the request to // download_requests_. diff --git a/chrome/browser/gtk/list_store_favicon_loader.cc b/chrome/browser/gtk/list_store_favicon_loader.cc index eff00a5e..5a34dd0 100644 --- a/chrome/browser/gtk/list_store_favicon_loader.cc +++ b/chrome/browser/gtk/list_store_favicon_loader.cc @@ -57,11 +57,8 @@ bool ListStoreFavIconLoader::GetRowByFavIconHandle( } void ListStoreFavIconLoader::OnGotFavIcon( - HistoryService::Handle handle, - bool know_fav_icon, - scoped_refptr<RefCountedBytes> image_data, - bool is_expired, - const GURL& icon_url) { + HistoryService::Handle handle, bool know_fav_icon, + scoped_refptr<RefCountedBytes> image_data, bool is_expired, GURL icon_url) { GtkTreeIter iter; if (!GetRowByFavIconHandle(handle, &iter)) return; diff --git a/chrome/browser/gtk/list_store_favicon_loader.h b/chrome/browser/gtk/list_store_favicon_loader.h index 69d6ae9..935c0f7 100644 --- a/chrome/browser/gtk/list_store_favicon_loader.h +++ b/chrome/browser/gtk/list_store_favicon_loader.h @@ -35,11 +35,9 @@ class ListStoreFavIconLoader { GtkTreeIter* result_iter); // Callback from HistoryService:::GetFavIconForURL - void OnGotFavIcon(HistoryService::Handle handle, - bool know_fav_icon, - scoped_refptr<RefCountedBytes> image_data, - bool is_expired, - const GURL& icon_url); + void OnGotFavIcon(HistoryService::Handle handle, bool know_fav_icon, + scoped_refptr<RefCountedBytes> image_data, bool is_expired, + GURL icon_url); // The list store we are loading favicons into. GtkListStore* list_store_; diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index caac179..0643139 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -270,8 +270,8 @@ class HistoryService : public CancelableRequestProvider, // some reason, success will additionally be false. If the given page // has redirected to multiple destinations, this will pick a random one. typedef Callback4<Handle, - const GURL&, // from_url - bool, // success + GURL, // from_url + bool, // success history::RedirectList*>::Type QueryRedirectsCallback; @@ -356,7 +356,7 @@ class HistoryService : public CancelableRequestProvider, bool, // know_favicon scoped_refptr<RefCountedBytes>, // data bool, // expired - const GURL&>::Type // url of the favicon + GURL>::Type // url of the favicon FavIconDataCallback; // Requests the favicon. FavIconConsumer is notified diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 8d153d8..23463440 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -240,7 +240,7 @@ class HistoryTest : public testing::Test { // Callback for QueryRedirects. void OnRedirectQueryComplete(HistoryService::Handle handle, - const GURL& url, + GURL url, bool success, history::RedirectList* redirects) { redirect_query_success_ = success; diff --git a/chrome/browser/jumplist.cc b/chrome/browser/jumplist.cc index 6ea210e..fcf39e6 100644 --- a/chrome/browser/jumplist.cc +++ b/chrome/browser/jumplist.cc @@ -709,7 +709,7 @@ void JumpList::OnFavIconDataAvailable( bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url) { + GURL icon_url) { // Attach the received data to the ShellLinkItem object. // This data will be decoded by JumpListUpdateTask. if (know_favicon && data.get() && !data->data.empty()) diff --git a/chrome/browser/jumplist.h b/chrome/browser/jumplist.h index 824e1ac..e107482 100644 --- a/chrome/browser/jumplist.h +++ b/chrome/browser/jumplist.h @@ -159,7 +159,7 @@ class JumpList : public TabRestoreService::Observer { bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url); + GURL icon_url); private: // Our consumers for HistoryService. diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc index 1c7a1ea..795755f 100644 --- a/chrome/browser/possible_url_model.cc +++ b/chrome/browser/possible_url_model.cc @@ -166,7 +166,7 @@ void PossibleURLModel::OnFavIconAvailable( bool fav_icon_available, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url) { + GURL icon_url) { if (profile_) { HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); diff --git a/chrome/browser/possible_url_model.h b/chrome/browser/possible_url_model.h index 582506d..4a688fe 100644 --- a/chrome/browser/possible_url_model.h +++ b/chrome/browser/possible_url_model.h @@ -51,7 +51,7 @@ class PossibleURLModel : public TableModel { bool fav_icon_available, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url); + GURL icon_url); virtual void SetObserver(TableModelObserver* observer) { observer_ = observer; diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc index 7b2dd65..97c6525 100644 --- a/chrome/browser/search_engines/template_url_table_model.cc +++ b/chrome/browser/search_engines/template_url_table_model.cc @@ -97,7 +97,7 @@ class ModelEntry { bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, - const GURL& icon_url) { + GURL icon_url) { load_state_ = LOADED; if (know_favicon && data.get() && PNGDecoder::Decode(&data->data, &fav_icon_)) { diff --git a/chrome/browser/thumbnail_store.cc b/chrome/browser/thumbnail_store.cc index 94e3e90..4f30c62 100644 --- a/chrome/browser/thumbnail_store.cc +++ b/chrome/browser/thumbnail_store.cc @@ -156,7 +156,7 @@ void ThumbnailStore::Shutdown() { void ThumbnailStore::OnRedirectsForURLAvailable( HistoryService::Handle handle, - const GURL& url, + GURL url, bool success, history::RedirectList* redirects) { if (!success) diff --git a/chrome/browser/thumbnail_store.h b/chrome/browser/thumbnail_store.h index aaa03ce..143cbce 100644 --- a/chrome/browser/thumbnail_store.h +++ b/chrome/browser/thumbnail_store.h @@ -117,7 +117,7 @@ class ThumbnailStore : public base::RefCountedThreadSafe<ThumbnailStore>, // will be called with url=C and redirects = {B -> A}. This information gets // inserted into the RedirectMap as A => {B -> C}. void OnRedirectsForURLAvailable(HistoryService::Handle handle, - const GURL& url, + GURL url, bool success, history::RedirectList* redirects); diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index f8c1dce..e99444d 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -106,7 +106,7 @@ class CustomHomePagesTableModel : public TableModel { bool know_fav_icon, scoped_refptr<RefCountedBytes> image_data, bool is_expired, - const GURL& icon_url); + GURL icon_url); // Returns the entry whose fav_icon_handle matches handle and sets entry_index // to the index of the entry. @@ -230,7 +230,7 @@ void CustomHomePagesTableModel::OnGotFavIcon( bool know_fav_icon, scoped_refptr<RefCountedBytes> image_data, bool is_expired, - const GURL& icon_url) { + GURL icon_url) { int entry_index; Entry* entry = GetEntryByLoadHandle(handle, &entry_index); DCHECK(entry); diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc index 8e9e90c..9168570 100644 --- a/chrome/common/child_thread.cc +++ b/chrome/common/child_thread.cc @@ -22,7 +22,7 @@ ChildThread::ChildThread() { Init(); } -ChildThread::ChildThread(const std::string& channel_name) +ChildThread::ChildThread(const std::string channel_name) : channel_name_(channel_name) { Init(); } diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h index afcd803..91ea9b7 100644 --- a/chrome/common/child_thread.h +++ b/chrome/common/child_thread.h @@ -20,7 +20,7 @@ class ChildThread : public IPC::Channel::Listener, // Creates the thread. ChildThread(); // Used for single-process mode. - ChildThread(const std::string& channel_name); + ChildThread(const std::string channel_name); virtual ~ChildThread(); // IPC::Message::Sender implementation: diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index c67c1f7..75395af 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -829,7 +829,7 @@ TEST_F(ExternalTabTestType, IncognitoMode) { tab = NULL; CloseBrowserAndServer(); - value_result.clear(); + value_result.empty(); clear_profile_ = false; external_tab_container = NULL; tab_wnd = NULL; diff --git a/net/base/bzip2_filter_unittest.cc b/net/base/bzip2_filter_unittest.cc index 3dd5e14..9b1eab5 100644 --- a/net/base/bzip2_filter_unittest.cc +++ b/net/base/bzip2_filter_unittest.cc @@ -43,7 +43,7 @@ class BZip2FilterUnitTest : public PlatformTest { file_path = file_path.AppendASCII("google.txt"); // Read data from the file into buffer. - ASSERT_TRUE(file_util::ReadFileToString(file_path, &source_buffer_)); + file_util::ReadFileToString(file_path, &source_buffer_); // Append the extra data to end of source source_buffer_.append(kExtraData, kExtraDataBufferSize); diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index aac0be2..5c55781 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -290,15 +290,12 @@ void FileStream::AsyncContext::RunAsynchronousCallback() { // FileStream ------------------------------------------------------------ -FileStream::FileStream() - : file_(base::kInvalidPlatformFileValue), - open_flags_(0) { +FileStream::FileStream() : file_(base::kInvalidPlatformFileValue) { DCHECK(!IsOpen()); } FileStream::FileStream(base::PlatformFile file, int flags) - : file_(file), - open_flags_(flags) { + : file_(file), open_flags_(flags) { // If the file handle is opened with base::PLATFORM_FILE_ASYNC, we need to // make sure we will perform asynchronous File IO to it. if (flags & base::PLATFORM_FILE_ASYNC) { diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc index f430d8e..4b8b12b 100644 --- a/net/base/file_stream_unittest.cc +++ b/net/base/file_stream_unittest.cc @@ -885,7 +885,7 @@ TEST_F(FileStreamTest, Truncate) { // Read in the contents and make sure we get back what we expected. std::string read_contents; - EXPECT_TRUE(file_util::ReadFileToString(temp_file_path(), &read_contents)); + file_util::ReadFileToString(temp_file_path(), &read_contents); EXPECT_EQ("01230123", read_contents); } diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc index cec6a9d..09ad88e 100644 --- a/net/base/file_stream_win.cc +++ b/net/base/file_stream_win.cc @@ -115,14 +115,11 @@ void FileStream::AsyncContext::OnIOCompleted( // FileStream ------------------------------------------------------------ -FileStream::FileStream() - : file_(INVALID_HANDLE_VALUE), - open_flags_(0) { +FileStream::FileStream() : file_(INVALID_HANDLE_VALUE) { } FileStream::FileStream(base::PlatformFile file, int flags) - : file_(file), - open_flags_(flags) { + : file_(file), open_flags_(flags) { // If the file handle is opened with base::PLATFORM_FILE_ASYNC, we need to // make sure we will perform asynchronous File IO to it. if (flags & base::PLATFORM_FILE_ASYNC) { diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc index 91409a9..c933014 100644 --- a/net/base/gzip_filter_unittest.cc +++ b/net/base/gzip_filter_unittest.cc @@ -66,7 +66,7 @@ class GZipUnitTest : public PlatformTest { file_path = file_path.AppendASCII("google.txt"); // Read data from the file into buffer. - ASSERT_TRUE(file_util::ReadFileToString(file_path, &source_buffer_)); + file_util::ReadFileToString(file_path, &source_buffer_); // Encode the data with deflate deflate_encode_buffer_ = new char[kDefaultBufferSize]; diff --git a/net/disk_cache/block_files_unittest.cc b/net/disk_cache/block_files_unittest.cc index b4ce107..ce76fd6 100644 --- a/net/disk_cache/block_files_unittest.cc +++ b/net/disk_cache/block_files_unittest.cc @@ -14,7 +14,7 @@ using base::Time; namespace { // Returns the number of files in this folder. -int NumberOfFiles(const std::wstring& path) { +int NumberOfFiles(const std::wstring path) { file_util::FileEnumerator iter(FilePath::FromWStringHack(path), false, file_util::FileEnumerator::FILES); int count = 0; diff --git a/net/url_request/url_request_view_cache_job.cc b/net/url_request/url_request_view_cache_job.cc index 4217f4f..6fd4e23 100644 --- a/net/url_request/url_request_view_cache_job.cc +++ b/net/url_request/url_request_view_cache_job.cc @@ -66,8 +66,7 @@ static std::string FormatEntryDetails(disk_cache::Entry* entry) { std::string result = EscapeForHTML(entry->GetKey()); net::HttpResponseInfo response; - if (!net::HttpCache::ReadResponseInfo(entry, &response)) - return "error reading cache entry"; + net::HttpCache::ReadResponseInfo(entry, &response); if (response.headers) { result.append("<hr><pre>"); |