Move blimp_layer_tree_settings.h/cc to client.

These aren't needed by the engine, so I'm moving this to blimp/client
from blimp/common to fix an engine build error.

BUG=527655

Review URL: https://codereview.chromium.org/1420883006

Cr-Commit-Position: refs/heads/master@{#358721}

blimp/client/BUILD.gn

@@ -13,10 +13,18 @@ shared_library("blimp_client") {
     "compositor/blimp_compositor.h",
     "compositor/blimp_context_provider.cc",
     "compositor/blimp_context_provider.h",
+    "compositor/blimp_layer_tree_settings.cc",
+    "compositor/blimp_layer_tree_settings.h",
     "compositor/blimp_output_surface.cc",
     "compositor/blimp_output_surface.h",
     "compositor/test/dummy_layer_driver.cc",
     "compositor/test/dummy_layer_driver.h",
+
+    # TODO(dtrainor): Remove this once the LayerTreeHost settings for Blimp
+    # are finalized or are pushed from the server component.  See
+    # crbug.com/527655.
+    "../../content/public/common/content_switches.cc",
+    "../../ui/native_theme/native_theme_switches.cc",
   ]
 
   deps = [

blimp/client/DEPS

@@ -13,4 +13,10 @@ include_rules = [
 
   # TODO(dtrainor): Remove this once Toast uses are removed from Java.
   "!ui/android",
+
+  # TODO(dtrainor): Remove this once the LayerTreeHost settings for Blimp
+  # are finalized or are pushed from the server component.  See
+  # crbug.com/527655.
+  "!content/public/common/content_switches.h",
+  "!ui/native_theme/native_theme_switches.h",
 ]

blimp/client/compositor/blimp_compositor.cc

@@ -13,9 +13,9 @@
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_restrictions.h"
 #include "blimp/client/compositor/blimp_context_provider.h"
+#include "blimp/client/compositor/blimp_layer_tree_settings.h"
 #include "blimp/client/compositor/blimp_output_surface.h"
 #include "blimp/client/compositor/test/dummy_layer_driver.h"
-#include "blimp/common/compositor/blimp_layer_tree_settings.h"
 #include "blimp/common/compositor/blimp_task_graph_runner.h"
 #include "cc/layers/layer.h"
 #include "cc/output/output_surface.h"

blimp/common/compositor/blimp_layer_tree_settings.cc → blimp/client/compositor/blimp_layer_tree_settings.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/common/compositor/blimp_layer_tree_settings.h"
+#include "blimp/client/compositor/blimp_layer_tree_settings.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"

blimp/client/compositor/blimp_layer_tree_settings.h

@@ -0,0 +1,30 @@
+// Copyright 2015 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 BLIMP_CLIENT_COMPOSITOR_BLIMP_LAYER_TREE_SETTINGS_H_
+#define BLIMP_CLIENT_COMPOSITOR_BLIMP_LAYER_TREE_SETTINGS_H_
+
+namespace base {
+class CommandLine;
+}
+
+namespace cc {
+class LayerTreeSettings;
+}
+
+namespace gfx {
+class Size;
+}
+
+namespace blimp {
+
+// Populates client |settings| based on defaults & command line flags.  This
+// might have to be tweaked into a message protocol if it turns out
+// the host compositor needs to actually drive some specific settings of the
+// client.
+void PopulateCommonLayerTreeSettings(cc::LayerTreeSettings* settings);
+
+}  // namespace blimp
+
+#endif  // BLIMP_CLIENT_COMPOSITOR_BLIMP_LAYER_TREE_SETTINGS_H_

blimp/common/BUILD.gn

@@ -7,15 +7,8 @@ import("//testing/test.gni")
 component("blimp_common") {
   sources = [
     "blimp_common_export.h",
-    "compositor/blimp_layer_tree_settings.cc",
-    "compositor/blimp_layer_tree_settings.h",
     "compositor/blimp_task_graph_runner.cc",
     "compositor/blimp_task_graph_runner.h",
-
-    # TODO(dtrainor): Remove this once the LayerTreeHost settings for Blimp
-    # are finalized or are pushed from the server component.  See
-    # crbug.com/527655.
-    "../../content/public/common/content_switches.cc",
   ]
 
   defines = [ "BLIMP_COMMON_IMPLEMENTATION=1" ]

blimp/common/DEPS

@@ -6,12 +6,4 @@ include_rules = [
   "+third_party/skia",
   "+ui/gfx",
   "+ui/gl",
-
-  # TODO(dtrainor): Verify we still need this.
-  "!ui/native_theme/native_theme_switches.h",
-
-  # TODO(dtrainor): Remove this once the LayerTreeHost settings for Blimp
-  # are finalized or are pushed from the server component.  See
-  # crbug.com/527655.
-  "!content/public/common/content_switches.h",
 ]