Rename MojoShellContext -> ServiceManagerContext.

content/browser/service_manager/merge_dictionary.cc

 // Copyright 2016 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 "content/browser/mojo/merge_dictionary.h"
+#include "content/browser/service_manager/merge_dictionary.h"
 
 namespace content {
 
 void MergeDictionary(base::DictionaryValue* target,
                      const base::DictionaryValue* source) {
   for (base::DictionaryValue::Iterator it(*source); !it.IsAtEnd();
        it.Advance()) {
     const base::Value* merge_value = &it.value();
     // Check whether we have to merge dictionaries.
     if (merge_value->IsType(base::Value::TYPE_DICTIONARY)) {
@@ skipping 18 matching lines @@
           continue;
         }
       }
     }
     // All other cases: Make a copy and hook it up.
     target->SetWithoutPathExpansion(it.key(), merge_value->DeepCopy());
   }
 }
 
 }  // namespace content