Rename MojoShellContext -> ServiceManagerContext.

content/browser/mojo/merge_dictionary.h

Index: content/browser/mojo/merge_dictionary.h
diff --git a/content/browser/mojo/merge_dictionary.h b/content/browser/mojo/merge_dictionary.h
deleted file mode 100644
index b587d39a106fbd2e73983ffbd22008e059572234..0000000000000000000000000000000000000000
--- a/content/browser/mojo/merge_dictionary.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.
-
-#ifndef CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_
-#define CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_
-
-#include "base/values.h"
-#include "content/common/content_export.h"
-
-namespace content {
-
-// Similar to base::DictionaryValue::MergeDictionary(), except concatenates
-// ListValue contents.
-// This is explicitly not part of base::DictionaryValue at brettw's request.
-void CONTENT_EXPORT MergeDictionary(base::DictionaryValue* target,
-                                    const base::DictionaryValue* source);
-
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_