Move gpu_test_config stuff from content/ to gpu/

content/browser/gpu/gpu_memory_test.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 "base/callback.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
-#include "content/test/gpu/gpu_test_config.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
+#include "gpu/config/gpu_test_config.h"
 #include "net/base/net_util.h"
 
 namespace content {
 
 // Run the tests with a memory limit of 256MB, and give
 // and extra 4MB of wiggle-room for over-allocation.
 const char* kMemoryLimitMBSwitch = "256";
 const size_t kMemoryLimitMB = 256;
 const size_t kSingleTabLimitMB = 128;
 const size_t kWiggleRoomMB = 4;
@@ skipping 17 matching lines @@
   size_t GetBytesAllocated() {
     message_loop_runner_ = new MessageLoopRunner;
     GpuDataManager::GetInstance()->AddObserver(this);
     GpuDataManager::GetInstance()->RequestVideoMemoryUsageStatsUpdate();
     message_loop_runner_->Run();
     GpuDataManager::GetInstance()->RemoveObserver(this);
     message_loop_runner_ = NULL;
     return bytes_allocated_;
   }
 
+
  private:
   size_t bytes_allocated_;
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
 };
 
 class GpuMemoryTest : public ContentBrowserTest {
  public:
   GpuMemoryTest()
       : allow_tests_to_run_(false),
         has_used_first_shell_(false) {
@@ skipping 157 matching lines @@
   Shell* tab = CreateNewTab();
   LoadPage(tab, PAGE_CSS3D, kMemoryLimitMB);
   // Make sure that the CSS3D page maxes out a single tab's budget (otherwise
   // the test doesn't test anything) but still stays under the limit.
   EXPECT_TRUE(MemoryUsageInRange(
      kSingleTabLimitMB - kWiggleRoomMB,
      kMemoryLimitMB + kWiggleRoomMB));
 }
 
 }  // namespace content