chrome/browser/extensions/extension_icon_manager_unittest.cc - Issue 9465030: Break two classes defined in json_value_serializer.cc, .h into separate files.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/extensions/extension_icon_manager_unittest.cc

Issue 9465030: Break two classes defined in json_value_serializer.cc, .h into separate files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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

OLD	NEW
1 // Copyright (c) 2011 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/json/json_value_serializer.h"	5 #include "base/json/json_file_value_serializer.h"

6 #include "base/message_loop.h"	6 #include "base/message_loop.h"

7 #include "base/path_service.h"	7 #include "base/path_service.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/extensions/extension_icon_manager.h"	9 #include "chrome/browser/extensions/extension_icon_manager.h"

10 #include "chrome/common/chrome_paths.h"	10 #include "chrome/common/chrome_paths.h"

11 #include "chrome/common/extensions/extension.h"	11 #include "chrome/common/extensions/extension.h"

12 #include "chrome/common/extensions/extension_resource.h"	12 #include "chrome/common/extensions/extension_resource.h"

13 #include "content/test/test_browser_thread.h"	13 #include "content/test/test_browser_thread.h"

14 #include "testing/gtest/include/gtest/gtest.h"	14 #include "testing/gtest/include/gtest/gtest.h"

15 #include "ui/gfx/skia_util.h"	15 #include "ui/gfx/skia_util.h"

(...skipping 113 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
129	129

130 // Now re-load the icon - we should get the same result bitmap (and not the	130 // Now re-load the icon - we should get the same result bitmap (and not the

131 // default icon).	131 // default icon).

132 icon_manager.LoadIcon(extension.get());	132 icon_manager.LoadIcon(extension.get());

133 WaitForImageLoad();	133 WaitForImageLoad();

134 SkBitmap second_icon = icon_manager.GetIcon(extension->id());	134 SkBitmap second_icon = icon_manager.GetIcon(extension->id());

135 EXPECT_FALSE(gfx::BitmapsAreEqual(second_icon, default_icon));	135 EXPECT_FALSE(gfx::BitmapsAreEqual(second_icon, default_icon));

136	136

137 EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon));	137 EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon));

138 }	138 }

OLD	NEW