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

Side by Side Diff: chrome/test/automation/automation_proxy_uitest.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | « chrome/service/service_utility_process_host.cc ('k') | chrome/test/unit/chrome_test_suite.cc » ('j') | 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) 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 <string> 5 #include <string>
6 6
7 #include "app/app_switches.h" 7 #include "app/app_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 24 matching lines...) Expand all
35 #include "chrome/test/ui_test_utils.h" 35 #include "chrome/test/ui_test_utils.h"
36 #include "chrome/test/ui/ui_test.h" 36 #include "chrome/test/ui/ui_test.h"
37 #include "gfx/codec/png_codec.h" 37 #include "gfx/codec/png_codec.h"
38 #include "gfx/rect.h" 38 #include "gfx/rect.h"
39 #include "net/base/net_util.h" 39 #include "net/base/net_util.h"
40 #include "net/test/test_server.h" 40 #include "net/test/test_server.h"
41 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING 41 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
42 #include "testing/gmock_mutant.h" 42 #include "testing/gmock_mutant.h"
43 #include "third_party/skia/include/core/SkBitmap.h" 43 #include "third_party/skia/include/core/SkBitmap.h"
44 #include "ui/base/message_box_flags.h" 44 #include "ui/base/message_box_flags.h"
45 #include "ui/base/ui_base_switches.h"
45 #include "views/event.h" 46 #include "views/event.h"
46 47
47 using ui_test_utils::TimedMessageLoopRunner; 48 using ui_test_utils::TimedMessageLoopRunner;
48 using testing::CreateFunctor; 49 using testing::CreateFunctor;
49 using testing::StrEq; 50 using testing::StrEq;
50 using testing::_; 51 using testing::_;
51 52
52 53
53 // Replace the default automation proxy with our mock client. 54 // Replace the default automation proxy with our mock client.
54 class ExternalTabUITestMockLauncher : public ProxyLauncher { 55 class ExternalTabUITestMockLauncher : public ProxyLauncher {
(...skipping 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1748 int diff_pixels_count = 0; 1749 int diff_pixels_count = 0;
1749 for (int x = 0; x < img_size.width(); ++x) { 1750 for (int x = 0; x < img_size.width(); ++x) {
1750 for (int y = 0; y < img_size.height(); ++y) { 1751 for (int y = 0; y < img_size.height(); ++y) {
1751 if (*snapshot_bmp.getAddr32(x, y) != *reference_bmp.getAddr32(x, y)) { 1752 if (*snapshot_bmp.getAddr32(x, y) != *reference_bmp.getAddr32(x, y)) {
1752 ++diff_pixels_count; 1753 ++diff_pixels_count;
1753 } 1754 }
1754 } 1755 }
1755 } 1756 }
1756 ASSERT_EQ(diff_pixels_count, 0); 1757 ASSERT_EQ(diff_pixels_count, 0);
1757 } 1758 }
OLDNEW
« no previous file with comments | « chrome/service/service_utility_process_host.cc ('k') | chrome/test/unit/chrome_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698