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

Side by Side Diff: chrome/browser/chromeos/first_run/goodies_displayer.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/chromeos/first_run/goodies_displayer.h" 5 #include "chrome/browser/chromeos/first_run/goodies_displayer.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 base::PostTaskAndReplyWithResult( 86 base::PostTaskAndReplyWithResult(
87 content::BrowserThread::GetBlockingPool(), FROM_HERE, 87 content::BrowserThread::GetBlockingPool(), FROM_HERE,
88 base::Bind(&CheckGoodiesPrefAgainstOobeTimestamp), 88 base::Bind(&CheckGoodiesPrefAgainstOobeTimestamp),
89 base::Bind(&UpdateGoodiesPrefCantShow)); 89 base::Bind(&UpdateGoodiesPrefCantShow));
90 } 90 }
91 return can_show; 91 return can_show;
92 } 92 }
93 93
94 // static 94 // static
95 void GoodiesDisplayer::InitForTesting(GoodiesDisplayerTestInfo* test_info) { 95 void GoodiesDisplayer::InitForTesting(GoodiesDisplayerTestInfo* test_info) {
96 CHECK(!g_test_info) << "GoodiesDisplayer::InitForTesting called twice"; 96 // GoodiesDisplayer::InitForTesting called twice
97 CHECK(!g_test_info);
97 g_test_info = test_info; 98 g_test_info = test_info;
98 test_info->setup_complete = !Init(); 99 test_info->setup_complete = !Init();
99 } 100 }
100 101
101 // static 102 // static
102 void GoodiesDisplayer::Delete() { 103 void GoodiesDisplayer::Delete() {
103 delete g_goodies_displayer; 104 delete g_goodies_displayer;
104 g_goodies_displayer = nullptr; 105 g_goodies_displayer = nullptr;
105 } 106 }
106 107
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::Bind(&Delete)); 143 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::Bind(&Delete));
143 } 144 }
144 145
145 GoodiesDisplayerTestInfo::GoodiesDisplayerTestInfo() 146 GoodiesDisplayerTestInfo::GoodiesDisplayerTestInfo()
146 : days_since_oobe(0), setup_complete(false) {} 147 : days_since_oobe(0), setup_complete(false) {}
147 148
148 GoodiesDisplayerTestInfo::~GoodiesDisplayerTestInfo() {} 149 GoodiesDisplayerTestInfo::~GoodiesDisplayerTestInfo() {}
149 150
150 } // namespace first_run 151 } // namespace first_run
151 } // namespace chromeos 152 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698