Ensure incognito TestingProfiles are incognito for their whole lifetime.

chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h"
 
 #include <vector>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 63 matching lines @@
   // Returns the writable profile used in this test.
   PrefService* GetPrefs();
 
  private:
   // An observer used for initializing the status of menu items added in this
   // test. A test should delete this RenderViewContextMenuObserver object.
   RenderViewContextMenuObserver* observer_;
 
   // A dummy profile used in this test. Call GetPrefs() when a test needs to
   // change this profile and use PrefService methods.
-  scoped_ptr<TestingProfile> profile_;
+  scoped_ptr<TestingProfile> original_profile_;
+
+  // Either |original_profile_| or its incognito profile.
+  Profile* profile_;
 
   // A list of menu items added by the SpellingMenuObserver class.
   std::vector<MockMenuItem> items_;
 
   DISALLOW_COPY_AND_ASSIGN(MockRenderViewContextMenu);
 };
 
 MockRenderViewContextMenu::MockRenderViewContextMenu(bool incognito)
     : observer_(NULL) {
-  TestingProfile::Builder builder;
-  if (incognito)
-    builder.SetIncognito();
-  profile_ = builder.Build();
+  original_profile_ = TestingProfile::Builder().Build();
+  profile_ = incognito ? original_profile_->GetOffTheRecordProfile()
+                       : original_profile_.get();
 }
 
 MockRenderViewContextMenu::~MockRenderViewContextMenu() {
 }
 
 void MockRenderViewContextMenu::AddMenuItem(int command_id,
                                             const base::string16& title) {
   MockMenuItem item;
   item.command_id = command_id;
   item.enabled = observer_->IsCommandIdEnabled(command_id);
@@ skipping 55 matching lines @@
 
 RenderViewHost* MockRenderViewContextMenu::GetRenderViewHost() const {
   return NULL;
 }
 
 WebContents* MockRenderViewContextMenu::GetWebContents() const {
   return NULL;
 }
 
 content::BrowserContext* MockRenderViewContextMenu::GetBrowserContext() const {
-  return profile_.get();
+  return profile_;
 }
 
 size_t MockRenderViewContextMenu::GetMenuSize() const {
   return items_.size();
 }
 
 bool MockRenderViewContextMenu::GetMenuItem(size_t i,
                                             MockMenuItem* item) const {
   if (i >= items_.size())
     return false;
@@ skipping 286 matching lines @@
   ForceSuggestMode();
   InitMenu("asdfkj", NULL);
 
   // Should have at least 2 entries. Separator, suggestion.
   EXPECT_LT(2U, menu()->GetMenuSize());
   menu()->GetMenuItem(0, &item);
   EXPECT_EQ(-1, item.command_id);
   menu()->GetMenuItem(1, &item);
   EXPECT_EQ(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, item.command_id);
 }