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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include "chrome/browser/browser.h" 7 #include "chrome/browser/browser.h"
8 #include "chrome/browser/pref_service.h" 8 #include "chrome/browser/prefs/pref_service.h"
9 #include "chrome/browser/profile.h" 9 #include "chrome/browser/profile.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 11
12 // Tabs is flaky on chromeos and linux views build. 12 // Tabs is flaky on chromeos and linux views build.
13 // http://crbug.com/48920 13 // http://crbug.com/48920
14 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) 14 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
15 #define MAYBE_Tabs FLAKY_Tabs 15 #define MAYBE_Tabs FLAKY_Tabs
16 #else 16 #else
17 #define MAYBE_Tabs Tabs 17 #define MAYBE_Tabs Tabs
18 #endif 18 #endif
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 ASSERT_TRUE(test_server()->Start()); 62 ASSERT_TRUE(test_server()->Start());
63 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", 63 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
64 "test_png.html")) << message_; 64 "test_png.html")) << message_;
65 } 65 }
66 66
67 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { 67 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) {
68 ASSERT_TRUE(test_server()->Start()); 68 ASSERT_TRUE(test_server()->Start());
69 69
70 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; 70 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_;
71 } 71 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698