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

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

Issue 284103002: Replace "external_install" boolean parameter with explicit enumeration in ExtensionUninstall method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address code review feedback. Created 6 years, 5 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 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 181
182 EXPECT_EQ(1, 182 EXPECT_EQ(1,
183 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 183 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
184 EXPECT_EQ(0, 184 EXPECT_EQ(0,
185 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 185 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
186 EXPECT_TRUE(activity_log1->IsWatchdogAppActive()); 186 EXPECT_TRUE(activity_log1->IsWatchdogAppActive());
187 EXPECT_FALSE(activity_log2->IsWatchdogAppActive()); 187 EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
188 EXPECT_TRUE(activity_log1->IsDatabaseEnabled()); 188 EXPECT_TRUE(activity_log1->IsDatabaseEnabled());
189 EXPECT_FALSE(activity_log2->IsDatabaseEnabled()); 189 EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
190 190
191 extension_service1->UninstallExtension(kExtensionID, false, NULL); 191 extension_service1->UninstallExtension(
192 kExtensionID, ExtensionService::UNINSTALL_REASON_DEFAULT, NULL);
192 193
193 EXPECT_EQ(0, 194 EXPECT_EQ(0,
194 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 195 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
195 EXPECT_EQ(0, 196 EXPECT_EQ(0,
196 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 197 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
197 EXPECT_FALSE(activity_log1->IsWatchdogAppActive()); 198 EXPECT_FALSE(activity_log1->IsWatchdogAppActive());
198 EXPECT_FALSE(activity_log2->IsWatchdogAppActive()); 199 EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
199 EXPECT_FALSE(activity_log1->IsDatabaseEnabled()); 200 EXPECT_FALSE(activity_log1->IsDatabaseEnabled());
200 EXPECT_FALSE(activity_log2->IsDatabaseEnabled()); 201 EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
201 202
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 .Set("manifest_version", 2)) 257 .Set("manifest_version", 2))
257 .SetID(kExtensionID) 258 .SetID(kExtensionID)
258 .Build(); 259 .Build();
259 extension_service->AddExtension(extension.get()); 260 extension_service->AddExtension(extension.get());
260 261
261 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); 262 EXPECT_TRUE(activity_log->IsDatabaseEnabled());
262 EXPECT_EQ(1, 263 EXPECT_EQ(1,
263 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 264 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
264 EXPECT_TRUE(activity_log->IsWatchdogAppActive()); 265 EXPECT_TRUE(activity_log->IsWatchdogAppActive());
265 266
266 extension_service->UninstallExtension(kExtensionID, false, NULL); 267 extension_service->UninstallExtension(
268 kExtensionID, ExtensionService::UNINSTALL_REASON_DEFAULT, NULL);
267 269
268 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); 270 EXPECT_TRUE(activity_log->IsDatabaseEnabled());
269 EXPECT_EQ(0, 271 EXPECT_EQ(0,
270 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); 272 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
271 EXPECT_FALSE(activity_log->IsWatchdogAppActive()); 273 EXPECT_FALSE(activity_log->IsWatchdogAppActive());
272 274
273 // Cleanup. 275 // Cleanup.
274 *CommandLine::ForCurrentProcess() = saved_cmdline_; 276 *CommandLine::ForCurrentProcess() = saved_cmdline_;
275 } 277 }
276 278
277 } // namespace extensions 279 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698