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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm

Issue 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit Created 7 years, 3 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) 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 "base/strings/string_number_conversions.h" 5 #include "base/strings/string_number_conversions.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock. h" 7 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock. h"
8 #include "chrome/browser/storage_monitor/storage_info.h" 8 #include "chrome/browser/storage_monitor/storage_info.h"
9 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h" 9 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h"
10 #include "chrome/common/extensions/extension.h" 10 #include "chrome/common/extensions/extension.h"
11 #include "chrome/common/extensions/extension_test_util.h" 11 #include "chrome/common/extensions/extension_test_util.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 using ::testing::_; 14 using ::testing::_;
15 using ::testing::NiceMock; 15 using ::testing::NiceMock;
16 using ::testing::Return; 16 using ::testing::Return;
17 using ::testing::ReturnPointee; 17 using ::testing::ReturnPointee;
18 using ::testing::ReturnRef; 18 using ::testing::ReturnRef;
19 19
20 namespace chrome {
21
22 MediaGalleryPrefInfo MakePrefInfoForTesting(MediaGalleryPrefId pref_id) { 20 MediaGalleryPrefInfo MakePrefInfoForTesting(MediaGalleryPrefId pref_id) {
23 MediaGalleryPrefInfo gallery; 21 MediaGalleryPrefInfo gallery;
24 gallery.pref_id = pref_id; 22 gallery.pref_id = pref_id;
25 gallery.device_id = 23 gallery.device_id =
26 StorageInfo::MakeDeviceId(StorageInfo::FIXED_MASS_STORAGE, 24 StorageInfo::MakeDeviceId(StorageInfo::FIXED_MASS_STORAGE,
27 base::Int64ToString(pref_id)); 25 base::Int64ToString(pref_id));
28 gallery.display_name = ASCIIToUTF16("name"); 26 gallery.display_name = ASCIIToUTF16("name");
29 return gallery; 27 return gallery;
30 } 28 }
31 29
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 199
202 // Remove a gallery. 200 // Remove a gallery.
203 attached_permissions.erase(attached_permissions.begin()); 201 attached_permissions.erase(attached_permissions.begin());
204 dialog->ForgetGallery(1); 202 dialog->ForgetGallery(1);
205 EXPECT_EQ(1U, [dialog->checkboxes_ count]); 203 EXPECT_EQ(1U, [dialog->checkboxes_ count]);
206 204
207 // The checkbox container should be shorter. 205 // The checkbox container should be shorter.
208 CGFloat new_container_height = NSHeight([dialog->checkbox_container_ frame]); 206 CGFloat new_container_height = NSHeight([dialog->checkbox_container_ frame]);
209 EXPECT_LT(new_container_height, old_container_height); 207 EXPECT_LT(new_container_height, old_container_height);
210 } 208 }
211
212 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698