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

Side by Side Diff: chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_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 "ash/launcher/launcher_model.h" 5 #include "ash/launcher/launcher_model.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/extensions/test_extension_system.h" 12 #include "chrome/browser/extensions/test_extension_system.h"
13 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 13 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
14 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" 14 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
15 #include "chrome/common/extensions/extension.h" 15 #include "chrome/common/extensions/extension.h"
16 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
17 #include "chrome/test/base/testing_pref_service.h" 17 #include "chrome/test/base/testing_pref_service.h"
18 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
19 #include "content/test/test_browser_thread.h" 19 #include "content/public/test/test_browser_thread.h"
20 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
23 using extensions::Extension; 23 using extensions::Extension;
24 24
25 class ChromeLauncherControllerTest : public testing::Test { 25 class ChromeLauncherControllerTest : public testing::Test {
26 protected: 26 protected:
27 ChromeLauncherControllerTest() 27 ChromeLauncherControllerTest()
28 : ui_thread_(content::BrowserThread::UI, &loop_), 28 : ui_thread_(content::BrowserThread::UI, &loop_),
29 extension_service_(NULL) { 29 extension_service_(NULL) {
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 GetAppLaunchers(&controller, &actual_launchers); 249 GetAppLaunchers(&controller, &actual_launchers);
250 EXPECT_EQ(expected_launchers, actual_launchers); 250 EXPECT_EQ(expected_launchers, actual_launchers);
251 251
252 // Install |extension2| and verify it shows up between the other two. 252 // Install |extension2| and verify it shows up between the other two.
253 extension_service_->AddExtension(extension2_.get()); 253 extension_service_->AddExtension(extension2_.get());
254 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id()); 254 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id());
255 GetAppLaunchers(&controller, &actual_launchers); 255 GetAppLaunchers(&controller, &actual_launchers);
256 EXPECT_EQ(expected_launchers, actual_launchers); 256 EXPECT_EQ(expected_launchers, actual_launchers);
257 } 257 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698