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

Side by Side Diff: chrome/browser/background/background_contents_service_unittest.cc

Issue 169523009: Fixes a memory leak in the new tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 #if !defined(OS_CHROMEOS) 168 #if !defined(OS_CHROMEOS)
169 message_center::MessageCenter::Initialize(); 169 message_center::MessageCenter::Initialize();
170 #endif 170 #endif
171 profile_manager_.reset(new TestingProfileManager( 171 profile_manager_.reset(new TestingProfileManager(
172 TestingBrowserProcess::GetGlobal())); 172 TestingBrowserProcess::GetGlobal()));
173 ASSERT_TRUE(profile_manager_->SetUp()); 173 ASSERT_TRUE(profile_manager_->SetUp());
174 profile_ = profile_manager_->CreateTestingProfile("Default"); 174 profile_ = profile_manager_->CreateTestingProfile("Default");
175 } 175 }
176 176
177 virtual void TearDown() { 177 virtual void TearDown() {
178 g_browser_process->notification_ui_manager()->CancelAll();
178 profile_manager_.reset(); 179 profile_manager_.reset();
179 profile_ = NULL; 180 profile_ = NULL;
180 #if !defined(OS_CHROMEOS) 181 #if !defined(OS_CHROMEOS)
181 message_center::MessageCenter::Shutdown(); 182 message_center::MessageCenter::Shutdown();
182 #endif 183 #endif
183 BrowserWithTestWindowTest::TearDown(); 184 BrowserWithTestWindowTest::TearDown();
184 } 185 }
185 186
186 protected: 187 protected:
187 Profile* profile() { return profile_; } 188 Profile* profile() { return profile_; }
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 // Extension manifest file with no 'icon' field. 370 // Extension manifest file with no 'icon' field.
370 scoped_refptr<extensions::Extension> extension = 371 scoped_refptr<extensions::Extension> extension =
371 extension_test_util::LoadManifest("app", "manifest.json"); 372 extension_test_util::LoadManifest("app", "manifest.json");
372 ASSERT_TRUE(extension.get()); 373 ASSERT_TRUE(extension.get());
373 ASSERT_FALSE(extension->GetManifestData("icons")); 374 ASSERT_FALSE(extension->GetManifestData("icons"));
374 375
375 const Notification* notification = CreateCrashNotification(extension); 376 const Notification* notification = CreateCrashNotification(extension);
376 EXPECT_FALSE(notification->icon().IsEmpty()); 377 EXPECT_FALSE(notification->icon().IsEmpty());
377 } 378 }
378 #endif 379 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698