diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-09 11:47:42 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 14:33:03 +0100 |
| commit | dc0f95d653279beabeb9817299e2902918ba123e (patch) | |
| tree | 32eb121cd532053a5b9cb0c390331349af8d6baa /chrome/browser/extensions/image_loading_tracker_unittest.cc | |
| parent | ba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff) | |
| download | external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2 | |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'chrome/browser/extensions/image_loading_tracker_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/image_loading_tracker_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc index b0516ad..e43d8d5 100644 --- a/chrome/browser/extensions/image_loading_tracker_unittest.cc +++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc @@ -4,7 +4,6 @@ #include "base/message_loop.h" #include "base/path_service.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" @@ -13,6 +12,7 @@ #include "chrome/common/json_value_serializer.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" @@ -75,7 +75,7 @@ class ImageLoadingTrackerTest : public testing::Test, return NULL; return Extension::Create( - test_file, Extension::INVALID, *valid_value, false, &error); + test_file, Extension::INVALID, *valid_value, false, true, &error); } SkBitmap image_; |