OLD | NEW |
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 "chrome/browser/extensions/extension_browsertest.h" | 5 #include "chrome/browser/extensions/extension_browsertest.h" |
6 #include "chrome/browser/extensions/extension_service.h" | 6 #include "chrome/browser/extensions/extension_service.h" |
7 #include "chrome/browser/extensions/extension_system.h" | 7 #include "chrome/browser/extensions/extension_system.h" |
8 #include "chrome/browser/extensions/extension_toolbar_model.h" | 8 #include "chrome/browser/extensions/extension_toolbar_model.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
11 #include "chrome/common/chrome_switches.h" | |
12 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
13 | 12 |
14 using extensions::Extension; | 13 using extensions::Extension; |
15 | 14 |
16 // An InProcessBrowserTest for testing the ExtensionToolbarModel. | 15 // An InProcessBrowserTest for testing the ExtensionToolbarModel. |
17 // TODO(erikkay) It's unfortunate that this needs to be an in-proc browser test. | 16 // TODO(erikkay) It's unfortunate that this needs to be an in-proc browser test. |
18 // It would be nice to refactor things so that ExtensionService could run | 17 // It would be nice to refactor things so that ExtensionService could run |
19 // without so much of the browser in place. | 18 // without so much of the browser in place. |
20 class ExtensionToolbarModelTest : public ExtensionBrowserTest, | 19 class ExtensionToolbarModelTest : public ExtensionBrowserTest, |
21 public ExtensionToolbarModel::Observer { | 20 public ExtensionToolbarModel::Observer { |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 | 64 |
66 protected: | 65 protected: |
67 ExtensionToolbarModel* model_; | 66 ExtensionToolbarModel* model_; |
68 | 67 |
69 int inserted_count_; | 68 int inserted_count_; |
70 int removed_count_; | 69 int removed_count_; |
71 int moved_count_; | 70 int moved_count_; |
72 }; | 71 }; |
73 | 72 |
74 IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, Basic) { | 73 IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, Basic) { |
75 CommandLine::ForCurrentProcess()->AppendSwitch( | |
76 switches::kEnableExperimentalExtensionApis); | |
77 | |
78 // Load an extension with no browser action. | 74 // Load an extension with no browser action. |
79 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") | 75 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") |
80 .AppendASCII("browser_action") | 76 .AppendASCII("browser_action") |
81 .AppendASCII("none"))); | 77 .AppendASCII("none"))); |
82 | 78 |
83 // This extension should not be in the model (has no browser action). | 79 // This extension should not be in the model (has no browser action). |
84 EXPECT_EQ(0, inserted_count_); | 80 EXPECT_EQ(0, inserted_count_); |
85 EXPECT_EQ(0u, model_->toolbar_items().size()); | 81 EXPECT_EQ(0u, model_->toolbar_items().size()); |
86 ASSERT_EQ(NULL, ExtensionAt(0)); | 82 ASSERT_EQ(NULL, ExtensionAt(0)); |
87 | 83 |
(...skipping 17 matching lines...) Expand all Loading... |
105 const Extension* extension2 = ExtensionAt(0); | 101 const Extension* extension2 = ExtensionAt(0); |
106 EXPECT_EQ(extension, extension2); | 102 EXPECT_EQ(extension, extension2); |
107 | 103 |
108 UnloadExtension(extension->id()); | 104 UnloadExtension(extension->id()); |
109 EXPECT_EQ(1, removed_count_); | 105 EXPECT_EQ(1, removed_count_); |
110 EXPECT_EQ(0u, model_->toolbar_items().size()); | 106 EXPECT_EQ(0u, model_->toolbar_items().size()); |
111 EXPECT_EQ(NULL, ExtensionAt(0)); | 107 EXPECT_EQ(NULL, ExtensionAt(0)); |
112 } | 108 } |
113 | 109 |
114 IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, ReorderAndReinsert) { | 110 IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, ReorderAndReinsert) { |
115 CommandLine::ForCurrentProcess()->AppendSwitch( | |
116 switches::kEnableExperimentalExtensionApis); | |
117 | |
118 // Load an extension with a browser action. | 111 // Load an extension with a browser action. |
119 base::FilePath extension_a_path(test_data_dir_.AppendASCII("api_test") | 112 base::FilePath extension_a_path(test_data_dir_.AppendASCII("api_test") |
120 .AppendASCII("browser_action") | 113 .AppendASCII("browser_action") |
121 .AppendASCII("basics")); | 114 .AppendASCII("basics")); |
122 ASSERT_TRUE(LoadExtension(extension_a_path)); | 115 ASSERT_TRUE(LoadExtension(extension_a_path)); |
123 | 116 |
124 // First extension loaded. | 117 // First extension loaded. |
125 EXPECT_EQ(1, inserted_count_); | 118 EXPECT_EQ(1, inserted_count_); |
126 EXPECT_EQ(1u, model_->toolbar_items().size()); | 119 EXPECT_EQ(1u, model_->toolbar_items().size()); |
127 const Extension* extensionA = ExtensionAt(0); | 120 const Extension* extensionA = ExtensionAt(0); |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 new_order.push_back(id_c); | 364 new_order.push_back(id_c); |
372 new_order.push_back(id_b); | 365 new_order.push_back(id_b); |
373 extensions::ExtensionPrefs::Get(browser()->profile())->SetToolbarOrder( | 366 extensions::ExtensionPrefs::Get(browser()->profile())->SetToolbarOrder( |
374 new_order); | 367 new_order); |
375 | 368 |
376 // Verify order is changed. | 369 // Verify order is changed. |
377 EXPECT_EQ(id_c, ExtensionAt(0)->id()); | 370 EXPECT_EQ(id_c, ExtensionAt(0)->id()); |
378 EXPECT_EQ(id_b, ExtensionAt(1)->id()); | 371 EXPECT_EQ(id_b, ExtensionAt(1)->id()); |
379 EXPECT_EQ(id_a, ExtensionAt(2)->id()); | 372 EXPECT_EQ(id_a, ExtensionAt(2)->id()); |
380 } | 373 } |
OLD | NEW |