Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Side by Side Diff: chrome/browser/android/offline_pages/offline_page_request_job.cc

Issue 2848703004: Switch SupportsUserData uses to use unique_ptr. (Closed)
Patch Set: rev Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/offline_pages/offline_page_request_job.h" 5 #include "chrome/browser/android/offline_pages/offline_page_request_job.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/ptr_util.h"
12 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
13 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
14 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
15 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
16 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h" 17 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
17 #include "chrome/browser/android/offline_pages/offline_page_tab_helper.h" 18 #include "chrome/browser/android/offline_pages/offline_page_tab_helper.h"
18 #include "chrome/browser/android/offline_pages/offline_page_utils.h" 19 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
19 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/profiles/profile_manager.h" 21 #include "chrome/browser/profiles/profile_manager.h"
21 #include "components/offline_pages/core/offline_page_model.h" 22 #include "components/offline_pages/core/offline_page_model.h"
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 return nullptr; 538 return nullptr;
538 539
539 OfflinePageRequestInfo* info = 540 OfflinePageRequestInfo* info =
540 OfflinePageRequestInfo::GetFromRequest(request); 541 OfflinePageRequestInfo::GetFromRequest(request);
541 if (info) { 542 if (info) {
542 // Fall back to default which is set when an offline page cannot be served, 543 // Fall back to default which is set when an offline page cannot be served,
543 // either page not found or online version desired. 544 // either page not found or online version desired.
544 if (info->use_default()) 545 if (info->use_default())
545 return nullptr; 546 return nullptr;
546 } else { 547 } else {
547 request->SetUserData(&kUserDataKey, new OfflinePageRequestInfo()); 548 request->SetUserData(&kUserDataKey,
549 base::MakeUnique<OfflinePageRequestInfo>());
548 } 550 }
549 551
550 return new OfflinePageRequestJob(request, network_delegate, previews_decider); 552 return new OfflinePageRequestJob(request, network_delegate, previews_decider);
551 } 553 }
552 554
553 OfflinePageRequestJob::OfflinePageRequestJob( 555 OfflinePageRequestJob::OfflinePageRequestJob(
554 net::URLRequest* request, 556 net::URLRequest* request,
555 net::NetworkDelegate* network_delegate, 557 net::NetworkDelegate* network_delegate,
556 previews::PreviewsDecider* previews_decider) 558 previews::PreviewsDecider* previews_decider)
557 : net::URLRequestFileJob( 559 : net::URLRequestFileJob(
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 713
712 URLRequestJob::NotifyHeadersComplete(); 714 URLRequestJob::NotifyHeadersComplete();
713 } 715 }
714 716
715 void OfflinePageRequestJob::SetDelegateForTesting( 717 void OfflinePageRequestJob::SetDelegateForTesting(
716 std::unique_ptr<Delegate> delegate) { 718 std::unique_ptr<Delegate> delegate) {
717 delegate_ = std::move(delegate); 719 delegate_ = std::move(delegate);
718 } 720 }
719 721
720 } // namespace offline_pages 722 } // namespace offline_pages
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698