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

Side by Side Diff: chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc

Issue 421193002: Fix ExtensionServiceTest.ClearExtensionData flakiness (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use base::DoNothing for empty callbacks Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "chrome/browser/extensions/activity_log/activity_log.h" 8 #include "chrome/browser/extensions/activity_log/activity_log.h"
9 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h" 9 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 EXPECT_EQ(1, 183 EXPECT_EQ(1,
184 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 184 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
185 EXPECT_EQ(0, 185 EXPECT_EQ(0,
186 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 186 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
187 EXPECT_TRUE(activity_log1->IsWatchdogAppActive()); 187 EXPECT_TRUE(activity_log1->IsWatchdogAppActive());
188 EXPECT_FALSE(activity_log2->IsWatchdogAppActive()); 188 EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
189 EXPECT_TRUE(activity_log1->IsDatabaseEnabled()); 189 EXPECT_TRUE(activity_log1->IsDatabaseEnabled());
190 EXPECT_FALSE(activity_log2->IsDatabaseEnabled()); 190 EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
191 191
192 extension_service1->UninstallExtension( 192 extension_service1->UninstallExtension(
193 kExtensionID, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); 193 kExtensionID,
194 extensions::UNINSTALL_REASON_FOR_TESTING,
195 base::Bind(&base::DoNothing),
196 NULL);
194 197
195 EXPECT_EQ(0, 198 EXPECT_EQ(0,
196 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 199 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
197 EXPECT_EQ(0, 200 EXPECT_EQ(0,
198 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 201 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
199 EXPECT_FALSE(activity_log1->IsWatchdogAppActive()); 202 EXPECT_FALSE(activity_log1->IsWatchdogAppActive());
200 EXPECT_FALSE(activity_log2->IsWatchdogAppActive()); 203 EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
201 EXPECT_FALSE(activity_log1->IsDatabaseEnabled()); 204 EXPECT_FALSE(activity_log1->IsDatabaseEnabled());
202 EXPECT_FALSE(activity_log2->IsDatabaseEnabled()); 205 EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
203 206
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 .SetID(kExtensionID) 262 .SetID(kExtensionID)
260 .Build(); 263 .Build();
261 extension_service->AddExtension(extension.get()); 264 extension_service->AddExtension(extension.get());
262 265
263 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); 266 EXPECT_TRUE(activity_log->IsDatabaseEnabled());
264 EXPECT_EQ(1, 267 EXPECT_EQ(1,
265 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 268 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
266 EXPECT_TRUE(activity_log->IsWatchdogAppActive()); 269 EXPECT_TRUE(activity_log->IsWatchdogAppActive());
267 270
268 extension_service->UninstallExtension( 271 extension_service->UninstallExtension(
269 kExtensionID, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); 272 kExtensionID,
273 extensions::UNINSTALL_REASON_FOR_TESTING,
274 base::Bind(&base::DoNothing),
275 NULL);
270 276
271 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); 277 EXPECT_TRUE(activity_log->IsDatabaseEnabled());
272 EXPECT_EQ(0, 278 EXPECT_EQ(0,
273 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 279 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
274 EXPECT_FALSE(activity_log->IsWatchdogAppActive()); 280 EXPECT_FALSE(activity_log->IsWatchdogAppActive());
275 281
276 // Cleanup. 282 // Cleanup.
277 *CommandLine::ForCurrentProcess() = saved_cmdline_; 283 *CommandLine::ForCurrentProcess() = saved_cmdline_;
278 } 284 }
279 285
280 } // namespace extensions 286 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698