Move 'theme' parsing out of Extension class

chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

 // Copyright (c) 2012 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/content_settings/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 127 matching lines @@
 
   Profile::RegisterUserPrefs(regular_prefs);
   chrome::RegisterUserPrefs(regular_prefs);
 
   builder.WithUserPrefs(otr_user_prefs);
   PrefServiceSyncable* otr_prefs = builder.CreateSyncable();
 
   Profile::RegisterUserPrefs(otr_prefs);
   chrome::RegisterUserPrefs(otr_prefs);
 
-  TestingProfile profile;
-  TestingProfile* otr_profile = new TestingProfile;
-  profile.SetOffTheRecordProfile(otr_profile);
-  profile.SetPrefService(regular_prefs);
+  TestingProfile::Builder profile_builder;
+  profile_builder.SetPrefService(make_scoped_ptr(regular_prefs).Pass());

[battre, 2013/02/07 09:45:08]

No need for calling ".Pass()"

[Joe Thomas, 2013/02/07 18:30:30]

Done.

+  scoped_ptr<TestingProfile> profile = profile_builder.Build();
+
+  TestingProfile::Builder otr_profile_builder;
+  otr_profile_builder.SetPrefService(make_scoped_ptr(otr_prefs).Pass());

[battre, 2013/02/07 09:45:08]

No need for calling ".Pass()"

[Joe Thomas, 2013/02/07 18:30:30]

Done.

+  TestingProfile* otr_profile = otr_profile_builder.Build().release();
+
   otr_profile->set_incognito(true);
-  otr_profile->SetPrefService(otr_prefs);
+  profile->SetOffTheRecordProfile(otr_profile);

[battre, 2013/02/07 09:45:08]

I think that this would be slightly cleaner:

TestingProfile::Builder otr_profile_builder;
otr_profile_builder.SetPrefService(make_scoped_ptr(otr_prefs))
otr_profile_builder.SetOffTheRecord();
profile->SetOffTheRecordProfile(otr_profile_builder.Build().release());

WDYT?

[Joe Thomas, 2013/02/07 14:22:54]

I had tried it already and it was causing a DCHECK failure. So I left it like
this.
Reason: While creating incognito profile, we dont call ProfileKeyedBaseFactory::
RegisterUserPrefs 
(http://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/browser/profiles/pr...).
So we dont register kUsesSystemTheme preference in 
ThemeServiceFactory::RegisterUserPrefs for incognito profile. This causes a
DCHECK failure in pref_service.cc while trying to read this preference from
GTKThemeService::Init.

 
   PrefProvider pref_content_settings_provider(regular_prefs, false);
   PrefProvider pref_content_settings_provider_incognito(otr_prefs, true);
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
   pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_IMAGES,
       "",
@@ skipping 219 matching lines @@
     DictionaryValue* mutable_settings = update.Get();
     mutable_settings->SetWithoutPathExpansion("www.example.com,*",
                                               new base::DictionaryValue());
   }
   EXPECT_TRUE(observer.notification_received());
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings