Supervised Users: Add tests for PermissionRequestCreatorApiary.

chrome/browser/supervised_user/supervised_user_service.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/supervised_user/supervised_user_service.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
@@ skipping 735 matching lines @@
   SupervisedUserSettingsService* settings_service = GetSettingsService();
   settings_service->SetActive(active_);
 
 #if defined(ENABLE_EXTENSIONS)
   SetExtensionsActive();
 #endif
 
   if (active_) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kPermissionRequestApiUrl)) {
-      permissions_creator_ =
-          PermissionRequestCreatorApiary::CreateWithProfile(profile_);
-    } else {
+      std::string value = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kPermissionRequestApiUrl);
+      GURL url(value);

[Bernhard Bauer, 2014/09/30 15:01:08]

You could probably inline |value|.

[Marc Treib, 2014/09/30 15:28:46]

Done.

+      if (url.is_valid()) {
+        permissions_creator_ =
+            PermissionRequestCreatorApiary::CreateWithProfile(url, profile_);
+      } else {
+        LOG(WARNING) << "Got invalid URL for "
+                     << switches::kPermissionRequestApiUrl
+                     << ", falling back to PermissionRequestCreatorSync";
+      }
+    }
+    if (!permissions_creator_) {
       PrefService* pref_service = profile_->GetPrefs();
       permissions_creator_.reset(new PermissionRequestCreatorSync(
           settings_service,
           SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
               profile_),
           GetSupervisedUserName(),
           pref_service->GetString(prefs::kSupervisedUserId)));
     }
 
     pref_change_registrar_.Add(
@@ skipping 178 matching lines @@
   // The active user can be NULL in unit tests.
   if (user_manager::UserManager::Get()->GetActiveUser()) {
     return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName(
         user_manager::UserManager::Get()->GetActiveUser()->GetUserID()));
   }
   return std::string();
 #else
   return profile_->GetPrefs()->GetString(prefs::kProfileName);
 #endif
 }