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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 "chrome/browser/content_settings/host_content_settings_map.h" 5 #include "chrome/browser/content_settings/host_content_settings_map.h"
6 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 6 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
7 #include "chrome/browser/prerender/prerender_manager.h" 7 #include "chrome/browser/prerender/prerender_manager.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 9 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
10 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 10 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
11 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" 11 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "content/test/test_browser_thread.h" 13 #include "content/public/test/test_browser_thread.h"
14 #include "content/test/test_renderer_host.h" 14 #include "content/test/test_renderer_host.h"
15 #include "net/cookies/cookie_options.h" 15 #include "net/cookies/cookie_options.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 using content::BrowserThread; 18 using content::BrowserThread;
19 19
20 class ContentSettingImageModelTest : public TabContentsWrapperTestHarness { 20 class ContentSettingImageModelTest : public TabContentsWrapperTestHarness {
21 public: 21 public:
22 ContentSettingImageModelTest() 22 ContentSettingImageModelTest()
23 : ui_thread_(BrowserThread::UI, &message_loop_) {} 23 : ui_thread_(BrowserThread::UI, &message_loop_) {}
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 content_settings->OnCookieChanged(GURL("http://google.com"), 63 content_settings->OnCookieChanged(GURL("http://google.com"),
64 GURL("http://google.com"), 64 GURL("http://google.com"),
65 "A=B", 65 "A=B",
66 options, 66 options,
67 false); 67 false);
68 content_setting_image_model->UpdateFromWebContents(contents()); 68 content_setting_image_model->UpdateFromWebContents(contents());
69 EXPECT_TRUE(content_setting_image_model->is_visible()); 69 EXPECT_TRUE(content_setting_image_model->is_visible());
70 EXPECT_NE(0, content_setting_image_model->get_icon()); 70 EXPECT_NE(0, content_setting_image_model->get_icon());
71 EXPECT_FALSE(content_setting_image_model->get_tooltip().empty()); 71 EXPECT_FALSE(content_setting_image_model->get_tooltip().empty());
72 } 72 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698