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

Side by Side Diff: chrome/browser/notifications/desktop_notifications_unittest.cc

Issue 7537033: Move more files from chrome/test to chrome/test/base, part #5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/notifications/desktop_notifications_unittest.h" 5 #include "chrome/browser/notifications/desktop_notifications_unittest.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/prefs/browser_prefs.h" 9 #include "chrome/browser/prefs/browser_prefs.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "chrome/test/testing_pref_service.h" 11 #include "chrome/test/base/testing_pref_service.h"
12 #include "content/common/desktop_notification_messages.h" 12 #include "content/common/desktop_notification_messages.h"
13 13
14 // static 14 // static
15 const int MockBalloonCollection::kMockBalloonSpace = 5; 15 const int MockBalloonCollection::kMockBalloonSpace = 5;
16 16
17 // static 17 // static
18 std::string DesktopNotificationsTest::log_output_; 18 std::string DesktopNotificationsTest::log_output_;
19 19
20 MockBalloonCollection::MockBalloonCollection() {} 20 MockBalloonCollection::MockBalloonCollection() {}
21 21
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 } 435 }
436 436
437 // Now change the position to upper left. Confirm that the X value for the 437 // Now change the position to upper left. Confirm that the X value for the
438 // balloons gets smaller. 438 // balloons gets smaller.
439 local_state_.SetInteger(prefs::kDesktopNotificationPosition, 439 local_state_.SetInteger(prefs::kDesktopNotificationPosition,
440 BalloonCollection::UPPER_LEFT); 440 BalloonCollection::UPPER_LEFT);
441 441
442 int current_x = (*balloons.begin())->GetPosition().x(); 442 int current_x = (*balloons.begin())->GetPosition().x();
443 EXPECT_LT(current_x, last_x); 443 EXPECT_LT(current_x, last_x);
444 } 444 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698