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

Side by Side Diff: chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderer_context_menu/spelling_menu_observer.h" 5 #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // A test class used in this file. This test should be a browser test because it 201 // A test class used in this file. This test should be a browser test because it
202 // accesses resources. 202 // accesses resources.
203 class SpellingMenuObserverTest : public InProcessBrowserTest { 203 class SpellingMenuObserverTest : public InProcessBrowserTest {
204 public: 204 public:
205 SpellingMenuObserverTest(); 205 SpellingMenuObserverTest();
206 206
207 virtual void SetUpOnMainThread() OVERRIDE { 207 virtual void SetUpOnMainThread() OVERRIDE {
208 Reset(false); 208 Reset(false);
209 } 209 }
210 210
211 virtual void CleanUpOnMainThread() OVERRIDE { 211 virtual void TearDownOnMainThread() OVERRIDE {
212 observer_.reset(); 212 observer_.reset();
213 menu_.reset(); 213 menu_.reset();
214 } 214 }
215 215
216 void Reset(bool incognito) { 216 void Reset(bool incognito) {
217 observer_.reset(); 217 observer_.reset();
218 menu_.reset(new MockRenderViewContextMenu(incognito)); 218 menu_.reset(new MockRenderViewContextMenu(incognito));
219 observer_.reset(new SpellingMenuObserver(menu_.get())); 219 observer_.reset(new SpellingMenuObserver(menu_.get()));
220 menu_->SetObserver(observer_.get()); 220 menu_->SetObserver(observer_.get());
221 } 221 }
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 ForceSuggestMode(); 470 ForceSuggestMode();
471 InitMenu("asdfkj", NULL); 471 InitMenu("asdfkj", NULL);
472 472
473 // Should have at least 2 entries. Separator, suggestion. 473 // Should have at least 2 entries. Separator, suggestion.
474 EXPECT_LT(2U, menu()->GetMenuSize()); 474 EXPECT_LT(2U, menu()->GetMenuSize());
475 menu()->GetMenuItem(0, &item); 475 menu()->GetMenuItem(0, &item);
476 EXPECT_EQ(-1, item.command_id); 476 EXPECT_EQ(-1, item.command_id);
477 menu()->GetMenuItem(1, &item); 477 menu()->GetMenuItem(1, &item);
478 EXPECT_EQ(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, item.command_id); 478 EXPECT_EQ(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, item.command_id);
479 } 479 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698